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

1 files changed, 0 insertions, 29 deletions

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);
-}