Make the API to open a message channel symmetric, so it works the same whether opening from a tab or extension.

Also, move the callback handling back to extension_process_bindings, since I
didn't need it in event_bindings to implement this, and it didn't make sense
there anyway.

BUG=12461
TEST=no

Review URL: http://codereview.chromium.org/149237

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20296 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 68 insertions, 71 deletions

diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc
index fc9e98d..13738ca 100644
--- a/chrome/renderer/extensions/bindings_utils.cc
+++ b/chrome/renderer/extensions/bindings_utils.cc
@@ -44,34 +44,6 @@ v8::Handle<v8::Value> ExtensionBase::GetChromeHidden(
   return hidden;
 }
 
-v8::Handle<v8::Value> ExtensionBase::StartRequest(
-    const v8::Arguments& args) {
-  // Get the current RenderView so that we can send a routed IPC message from
-  // the correct source.
-  RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
-  if (!renderview)
-    return v8::Undefined();
-
-  if (args.Length() != 3 || !args[0]->IsString() || !args[1]->IsInt32() ||
-      !args[2]->IsBoolean())
-    return v8::Undefined();
-
-  std::string name = *v8::String::AsciiValue(args.Data());
-  std::string json_args = *v8::String::Utf8Value(args[0]);
-  int request_id = args[1]->Int32Value();
-  bool has_callback = args[2]->BooleanValue();
-
-  v8::Persistent<v8::Context> current_context =
-      v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
-  DCHECK(!current_context.IsEmpty());
-  GetPendingRequestMap()[request_id].reset(new PendingRequest(
-      current_context, *v8::String::AsciiValue(args.Data())));
-
-  renderview->SendExtensionRequest(name, json_args, request_id, has_callback);
-
-  return v8::Undefined();
-}
-
 ContextList& GetContexts() {
   return Singleton<SingletonData>::get()->contexts;
 }
diff --git a/chrome/renderer/extensions/bindings_utils.h b/chrome/renderer/extensions/bindings_utils.h
index 1b21023..2e8935a5 100644
--- a/chrome/renderer/extensions/bindings_utils.h
+++ b/chrome/renderer/extensions/bindings_utils.h
@@ -39,10 +39,6 @@ class ExtensionBase : public v8::Extension {
   // Returns a hidden variable for use by the bindings that is unreachable
   // by the page.
   static v8::Handle<v8::Value> GetChromeHidden(const v8::Arguments& args);
-
-  // Starts an API request to the browser, with an optional callback.  The
-  // callback will be dispatched to EventBindings::HandleResponse.
-  static v8::Handle<v8::Value> StartRequest(const v8::Arguments& args);
 };
 
 template<int kResourceId>
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index e9efbad..03cccad 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -23,7 +23,6 @@ using bindings_utils::GetContexts;
 using bindings_utils::GetStringResource;
 using bindings_utils::ExtensionBase;
 using bindings_utils::GetPendingRequestMap;
-using bindings_utils::PendingRequest;
 using bindings_utils::PendingRequestMap;
 
 namespace {
@@ -62,8 +61,6 @@ class ExtensionImpl : public ExtensionBase {
       return v8::FunctionTemplate::New(AttachEvent);
     } else if (name->Equals(v8::String::New("DetachEvent"))) {
       return v8::FunctionTemplate::New(DetachEvent);
-    } else if (name->Equals(v8::String::New("GetNextRequestId"))) {
-      return v8::FunctionTemplate::New(GetNextRequestId);
     }
     return ExtensionBase::GetNativeFunction(name);
   }
@@ -100,11 +97,6 @@ class ExtensionImpl : public ExtensionBase {
 
     return v8::Undefined();
   }
-
-  static v8::Handle<v8::Value> GetNextRequestId(const v8::Arguments& args) {
-    static int next_request_id = 0;
-    return v8::Integer::New(next_request_id++);
-  }
 };
 
 }  // namespace
@@ -191,24 +183,3 @@ void EventBindings::CallFunction(const std::string& function_name,
     CallFunctionInContext((*it)->context, function_name, argc, argv);
   }
 }
-
-// static
-void EventBindings::HandleResponse(int request_id, bool success,
-                                   const std::string& response,
-                                   const std::string& error) {
-  PendingRequest* request = GetPendingRequestMap()[request_id].get();
-  if (!request)
-    return;  // The frame went away.
-
-  v8::HandleScope handle_scope;
-  v8::Handle<v8::Value> argv[5];
-  argv[0] = v8::Integer::New(request_id);
-  argv[1] = v8::String::New(request->name.c_str());
-  argv[2] = v8::Boolean::New(success);
-  argv[3] = v8::String::New(response.c_str());
-  argv[4] = v8::String::New(error.c_str());
-  CallFunctionInContext(
-      request->context, "handleResponse", arraysize(argv), argv);
-
-  GetPendingRequestMap().erase(request_id);
-}
diff --git a/chrome/renderer/extensions/event_bindings.h b/chrome/renderer/extensions/event_bindings.h
index 285a379..ea0060f 100644
--- a/chrome/renderer/extensions/event_bindings.h
+++ b/chrome/renderer/extensions/event_bindings.h
@@ -31,11 +31,6 @@ class EventBindings {
   // more details.
   static void CallFunction(const std::string& function_name, int argc,
                            v8::Handle<v8::Value>* argv);
-
-  // Handles a response to an API request.
-  static void HandleResponse(int request_id, bool success,
-                             const std::string& response,
-                             const std::string& error);
 };
 
 #endif  // CHROME_RENDERER_EXTENSIONS_EVENT_BINDINGS_H_
diff --git a/chrome/renderer/extensions/extension_api_client_unittest.cc b/chrome/renderer/extensions/extension_api_client_unittest.cc
index 6cef5750..663a892 100644
--- a/chrome/renderer/extensions/extension_api_client_unittest.cc
+++ b/chrome/renderer/extensions/extension_api_client_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/extensions/event_bindings.h"
+#include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -91,7 +91,8 @@ TEST_F(ExtensionAPIClientTest, CallbackDispatching) {
   ASSERT_GE(callback_id, 0);
 
   // Now send the callback a response
-  EventBindings::HandleResponse(callback_id, true, "{\"foo\":\"bar\"}", "");
+  ExtensionProcessBindings::HandleResponse(
+      callback_id, true, "{\"foo\":\"bar\"}", "");
 
   // And verify that it worked
   ASSERT_EQ("pass", GetConsoleMessage());
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 6b568a1..e68fb82 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -19,6 +19,8 @@ using bindings_utils::GetStringResource;
 using bindings_utils::ContextInfo;
 using bindings_utils::ContextList;
 using bindings_utils::GetContexts;
+using bindings_utils::GetPendingRequestMap;
+using bindings_utils::PendingRequest;
 using bindings_utils::ExtensionBase;
 
 namespace {
@@ -58,8 +60,10 @@ class ExtensionImpl : public ExtensionBase {
 
     if (name->Equals(v8::String::New("GetViews"))) {
       return v8::FunctionTemplate::New(GetViews);
+    } else if (name->Equals(v8::String::New("GetNextRequestId"))) {
+      return v8::FunctionTemplate::New(GetNextRequestId);
     } else if (names->find(*v8::String::AsciiValue(name)) != names->end()) {
-      return v8::FunctionTemplate::New(ExtensionBase::StartRequest, name);
+      return v8::FunctionTemplate::New(StartRequest, name);
     }
 
     return ExtensionBase::GetNativeFunction(name);
@@ -88,6 +92,40 @@ class ExtensionImpl : public ExtensionBase {
     }
     return views;
   }
+
+  static v8::Handle<v8::Value> GetNextRequestId(const v8::Arguments& args) {
+    static int next_request_id = 0;
+    return v8::Integer::New(next_request_id++);
+  }
+  
+  // Starts an API request to the browser, with an optional callback.  The
+  // callback will be dispatched to EventBindings::HandleResponse.
+  static v8::Handle<v8::Value> StartRequest(const v8::Arguments& args) {
+    // Get the current RenderView so that we can send a routed IPC message from
+    // the correct source.
+    RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
+    if (!renderview)
+      return v8::Undefined();
+
+    if (args.Length() != 3 || !args[0]->IsString() || !args[1]->IsInt32() ||
+        !args[2]->IsBoolean())
+      return v8::Undefined();
+
+    std::string name = *v8::String::AsciiValue(args.Data());
+    std::string json_args = *v8::String::Utf8Value(args[0]);
+    int request_id = args[1]->Int32Value();
+    bool has_callback = args[2]->BooleanValue();
+
+    v8::Persistent<v8::Context> current_context =
+        v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
+    DCHECK(!current_context.IsEmpty());
+    GetPendingRequestMap()[request_id].reset(new PendingRequest(
+        current_context, *v8::String::AsciiValue(args.Data())));
+
+    renderview->SendExtensionRequest(name, json_args, request_id, has_callback);
+
+    return v8::Undefined();
+  }
 };
 
 }  // namespace
@@ -100,3 +138,24 @@ void ExtensionProcessBindings::SetFunctionNames(
     const std::vector<std::string>& names) {
   ExtensionImpl::SetFunctionNames(names);
 }
+
+// static
+void ExtensionProcessBindings::HandleResponse(int request_id, bool success,
+                                              const std::string& response,
+                                              const std::string& error) {
+  PendingRequest* request = GetPendingRequestMap()[request_id].get();
+  if (!request)
+    return;  // The frame went away.
+
+  v8::HandleScope handle_scope;
+  v8::Handle<v8::Value> argv[5];
+  argv[0] = v8::Integer::New(request_id);
+  argv[1] = v8::String::New(request->name.c_str());
+  argv[2] = v8::Boolean::New(success);
+  argv[3] = v8::String::New(response.c_str());
+  argv[4] = v8::String::New(error.c_str());
+  bindings_utils::CallFunctionInContext(
+      request->context, "handleResponse", arraysize(argv), argv);
+
+  GetPendingRequestMap().erase(request_id);
+}
diff --git a/chrome/renderer/extensions/extension_process_bindings.h b/chrome/renderer/extensions/extension_process_bindings.h
index f703914..9e2c814 100644
--- a/chrome/renderer/extensions/extension_process_bindings.h
+++ b/chrome/renderer/extensions/extension_process_bindings.h
@@ -12,12 +12,15 @@
 
 #include "v8/include/v8.h"
 
-class WebFrame;
-
 class ExtensionProcessBindings {
  public:
   static void SetFunctionNames(const std::vector<std::string>& names);
   static v8::Extension* Get();
+
+  // Handles a response to an API request.
+  static void HandleResponse(int request_id, bool success,
+                             const std::string& response,
+                             const std::string& error);
 };
 
 #endif  // CHROME_RENDERER_EXTENSIONS_EXTENSION_PROCESS_BINDINGS_H_