Revert 184837

chrome/renderer/extensions/extension_custom_bindings.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/extension_custom_bindings.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/view_type.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/extension_helper.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
 
 namespace {
 
 }  // namespace
 
-ExtensionCustomBindings::ExtensionCustomBindings(
-    Dispatcher* dispatcher,
-    v8::Handle<v8::Context> context)
-    : ChromeV8Extension(dispatcher, context) {
+ExtensionCustomBindings::ExtensionCustomBindings(Dispatcher* dispatcher)
+    : ChromeV8Extension(dispatcher) {
   RouteStaticFunction("GetExtensionViews", &GetExtensionViews);
 }
 
 // static
 v8::Handle<v8::Value> ExtensionCustomBindings::GetExtensionViews(
     const v8::Arguments& args) {
   if (args.Length() != 2)
     return v8::Undefined();
 
   if (!args[0]->IsInt32() || !args[1]->IsString())
@@ skipping 24 matching lines @@
     view_type = chrome::VIEW_TYPE_APP_SHELL;
   } else if (view_type_string == chrome::kViewTypePanel) {
     view_type = chrome::VIEW_TYPE_PANEL;
   } else if (view_type_string != chrome::kViewTypeAll) {
     return v8::Undefined();
   }
 
   ExtensionCustomBindings* v8_extension =
       GetFromArguments<ExtensionCustomBindings>(args);
   const Extension* extension =
-      v8_extension->GetExtensionForRenderView();
+      v8_extension->GetExtensionForCurrentRenderView();
   if (!extension)
     return v8::Undefined();
 
   std::vector<content::RenderView*> views = ExtensionHelper::GetExtensionViews(
       extension->id(), browser_window_id, view_type);
   v8::Local<v8::Array> v8_views = v8::Array::New();
   int v8_index = 0;
   for (size_t i = 0; i < views.size(); ++i) {
     v8::Local<v8::Context> context =
         views[i]->GetWebView()->mainFrame()->mainWorldScriptContext();
     if (!context.IsEmpty()) {
       v8::Local<v8::Value> window = context->Global();
       DCHECK(!window.IsEmpty());
       v8_views->Set(v8::Integer::New(v8_index++), window);
     }
   }
 
   return v8_views;
 }
 
 }  // namespace extensions