From ef5342b86ec6121db3a36e75b75b8b50cffe5582 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 22 Apr 2014 11:06:13 +0800
Subject: [PATCH] Simplify atom_browser_bindings.

---
 atom/browser/api/atom_browser_bindings.cc | 15 +++++++--------
 atom/browser/api/atom_browser_bindings.h  |  4 +---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/atom/browser/api/atom_browser_bindings.cc b/atom/browser/api/atom_browser_bindings.cc
index 2a69a595c275..b6b0ae6e280c 100644
--- a/atom/browser/api/atom_browser_bindings.cc
+++ b/atom/browser/api/atom_browser_bindings.cc
@@ -6,10 +6,12 @@
 
 #include <vector>
 
-#include "base/logging.h"
 #include "atom/browser/api/event.h"
-#include "atom/common/v8/native_type_conversions.h"
-#include "content/public/browser/browser_thread.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/v8_value_converter.h"
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
 
 #include "atom/common/node_includes.h"
 
@@ -18,9 +20,6 @@ namespace atom {
 AtomBrowserBindings::AtomBrowserBindings() {
 }
 
-AtomBrowserBindings::~AtomBrowserBindings() {
-}
-
 void AtomBrowserBindings::OnRendererMessage(int process_id,
                                             int routing_id,
                                             const string16& channel,
@@ -33,7 +32,7 @@ void AtomBrowserBindings::OnRendererMessage(int process_id,
   // process.emit(channel, 'message', process_id, routing_id);
   std::vector<v8::Handle<v8::Value>> arguments;
   arguments.reserve(3 + args.GetSize());
-  arguments.push_back(ToV8Value(channel));
+  arguments.push_back(mate::ConvertToV8(node_isolate, channel));
   const base::Value* value;
   if (args.Get(0, &value))
     arguments.push_back(converter->ToV8Value(value, global_env->context()));
@@ -71,7 +70,7 @@ void AtomBrowserBindings::OnRendererMessageSync(
   // process.emit(channel, 'sync-message', event, process_id, routing_id);
   std::vector<v8::Handle<v8::Value>> arguments;
   arguments.reserve(3 + args.GetSize());
-  arguments.push_back(ToV8Value(channel));
+  arguments.push_back(mate::ConvertToV8(node_isolate, channel));
   const base::Value* value;
   if (args.Get(0, &value))
     arguments.push_back(converter->ToV8Value(value, global_env->context()));
diff --git a/atom/browser/api/atom_browser_bindings.h b/atom/browser/api/atom_browser_bindings.h
index e015206322a8..e967a4020f82 100644
--- a/atom/browser/api/atom_browser_bindings.h
+++ b/atom/browser/api/atom_browser_bindings.h
@@ -5,9 +5,8 @@
 #ifndef ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_H_
 #define ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_H_
 
-#include "base/strings/string16.h"
 #include "atom/common/api/atom_bindings.h"
-#include "atom/common/v8/scoped_persistent.h"
+#include "base/strings/string16.h"
 
 namespace base {
 class ListValue;
@@ -26,7 +25,6 @@ namespace atom {
 class AtomBrowserBindings : public AtomBindings {
  public:
   AtomBrowserBindings();
-  virtual ~AtomBrowserBindings();
 
   // Called when received a message from renderer.
   void OnRendererMessage(int process_id,