[Extensions Bindings] Move request dispatch to APIRequestHandler

extensions/renderer/api_bindings_system.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/api_bindings_system.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "extensions/renderer/api_binding_hooks.h"
 
 namespace extensions {
 
 APIBindingsSystem::APIBindingsSystem(
     const binding::RunJSFunction& call_js,
     const binding::RunJSFunctionSync& call_js_sync,
     const GetAPISchemaMethod& get_api_schema,
-    const APIBinding::SendRequestMethod& send_request,
+    const APIRequestHandler::SendRequestMethod& send_request,
     const APIEventHandler::EventListenersChangedMethod& event_listeners_changed,
     APILastError last_error)
     : type_reference_map_(base::Bind(&APIBindingsSystem::InitializeType,
                                      base::Unretained(this))),
-      request_handler_(call_js, std::move(last_error)),
+      request_handler_(send_request, call_js, std::move(last_error)),
       event_handler_(call_js, event_listeners_changed),
       call_js_(call_js),
       call_js_sync_(call_js_sync),
-      get_api_schema_(get_api_schema),
-      send_request_(send_request) {}
+      get_api_schema_(get_api_schema) {}
 
 APIBindingsSystem::~APIBindingsSystem() {}
 
 v8::Local<v8::Object> APIBindingsSystem::CreateAPIInstance(
     const std::string& api_name,
     v8::Local<v8::Context> context,
     v8::Isolate* isolate,
     const APIBinding::AvailabilityCallback& is_available,
     v8::Local<v8::Object>* hooks_interface_out) {
   std::unique_ptr<APIBinding>& binding = api_bindings_[api_name];
@@ skipping 25 matching lines @@
   auto iter = binding_hooks_.find(api_name);
   if (iter != binding_hooks_.end()) {
     hooks = std::move(iter->second);
     binding_hooks_.erase(iter);
   } else {
     hooks = base::MakeUnique<APIBindingHooks>(call_js_sync_);
   }
 
   return base::MakeUnique<APIBinding>(
       api_name, function_definitions, type_definitions, event_definitions,
-      property_definitions, send_request_, std::move(hooks),
-      &type_reference_map_, &request_handler_, &event_handler_);
+      property_definitions, std::move(hooks), &type_reference_map_,
+      &request_handler_, &event_handler_);
 }
 
 void APIBindingsSystem::InitializeType(const std::string& type_name) {
   // In order to initialize the type, we just initialize the full binding. This
   // seems like a lot of work, but in practice, trying to extract out only the
   // types from the schema, and then update the reference map based on that, is
   // close enough to the same cost. Additionally, this happens lazily on API
   // use, and relatively few APIs specify types from another API. Finally, this
   // will also go away if/when we generate all these specifications.
   std::string::size_type dot = type_name.rfind('.');
@@ skipping 24 matching lines @@
     const std::string& api_name) {
   DCHECK(api_bindings_.empty())
       << "Hook registration must happen before creating any binding instances.";
   std::unique_ptr<APIBindingHooks>& hooks = binding_hooks_[api_name];
   if (!hooks)
     hooks = base::MakeUnique<APIBindingHooks>(call_js_sync_);
   return hooks.get();
 }
 
 }  // namespace extensions