Make miscellaneous_bindings and event_bindings Required as needed. Previously

chrome/renderer/extensions/chrome_v8_context_set.cc

 // Copyright (c) 2012 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 "chrome/renderer/extensions/chrome_v8_context_set.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/constants.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 
 using content::RenderThread;
-using content::V8ValueConverter;
 
 namespace extensions {
 
 ChromeV8ContextSet::ChromeV8ContextSet() {
 }
 ChromeV8ContextSet::~ChromeV8ContextSet() {
 }
 
 int ChromeV8ContextSet::size() const {
   return static_cast<int>(contexts_.size());
@@ skipping 35 matching lines @@
     v8::Handle<v8::Context> v8_context) const {
   for (ContextSet::const_iterator iter = contexts_.begin();
        iter != contexts_.end(); ++iter) {
     if ((*iter)->v8_context() == v8_context)
       return *iter;
   }
 
   return NULL;
 }
 
-void ChromeV8ContextSet::DispatchChromeHiddenMethod(
+void ChromeV8ContextSet::ForEach(
     const std::string& extension_id,
-    const std::string& method_name,
-    const base::ListValue& arguments,
-    content::RenderView* render_view) const {
-  v8::HandleScope handle_scope;
-
+    content::RenderView* render_view,
+    const base::Callback<void(ChromeV8Context*)>& callback) const {
   // We copy the context list, because calling into javascript may modify it
   // out from under us.
   ContextSet contexts = GetAll();
 
-  scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
   for (ContextSet::iterator it = contexts.begin(); it != contexts.end();
        ++it) {
-    if ((*it)->v8_context().IsEmpty())
-      continue;
-
     if (!extension_id.empty()) {
       const Extension* extension = (*it)->extension();
       if (!extension || (extension_id != extension->id()))
         continue;
     }
 
     content::RenderView* context_render_view = (*it)->GetRenderView();
     if (!context_render_view)
       continue;
 
     if (render_view && render_view != context_render_view)
       continue;
 
-    v8::Local<v8::Context> context(*((*it)->v8_context()));
-    std::vector<v8::Handle<v8::Value> > v8_arguments;
-    for (size_t i = 0; i < arguments.GetSize(); ++i) {
-      const base::Value* item = NULL;
-      CHECK(arguments.Get(i, &item));
-      v8_arguments.push_back(converter->ToV8Value(item, context));
-    }
-
-    v8::Handle<v8::Value> retval;
-    (*it)->CallChromeHiddenMethod(
-        method_name, v8_arguments.size(), &v8_arguments[0], &retval);
+    callback.Run(*it);
   }
 }
 
 ChromeV8ContextSet::ContextSet ChromeV8ContextSet::OnExtensionUnloaded(
     const std::string& extension_id) {
   ContextSet contexts = GetAll();
   ContextSet removed;
 
   // Clean up contexts belonging to the unloaded extension. This is done so
   // that content scripts (which remain injected into the page) don't continue
   // receiving events and sending messages.
   for (ContextSet::iterator it = contexts.begin(); it != contexts.end();
        ++it) {
     if ((*it)->extension() && (*it)->extension()->id() == extension_id) {
       (*it)->DispatchOnUnloadEvent();
       removed.insert(*it);
       Remove(*it);
     }
   }
 
   return removed;
 }
 
 }  // namespace extensions