Revert 186643 - Caused a 10% regression on SunSpider benchmark

chrome/renderer/extensions/content_watcher.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/common/extensions/extension_messages.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/content_watcher.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.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"
 
 namespace extensions {
 
 namespace {
-
 class MutationHandler : public ChromeV8Extension {
  public:
   explicit MutationHandler(Dispatcher* dispatcher,
-                           v8::Handle<v8::Context> v8_context,
                            base::WeakPtr<ContentWatcher> content_watcher)
-      : ChromeV8Extension(dispatcher, v8_context),
+      : ChromeV8Extension(dispatcher),
         content_watcher_(content_watcher) {
     RouteFunction("FrameMutated",
                   base::Bind(&MutationHandler::FrameMutated,
                              base::Unretained(this)));
   }
 
  private:
   v8::Handle<v8::Value> FrameMutated(const v8::Arguments& args) {
     if (content_watcher_) {
       content_watcher_->ScanAndNotify(
-          WebKit::WebFrame::frameForContext(v8_context()));
+          WebKit::WebFrame::frameForCurrentContext());
     }
     return v8::Undefined();
   }
 
   base::WeakPtr<ContentWatcher> content_watcher_;
 };
 
 }  // namespace
 
 ContentWatcher::ContentWatcher(Dispatcher* dispatcher)
     : weak_ptr_factory_(this),
       dispatcher_(dispatcher) {}
 ContentWatcher::~ContentWatcher() {}
 
-scoped_ptr<NativeHandler> ContentWatcher::MakeNatives(
-    v8::Handle<v8::Context> v8_context) {
-  return scoped_ptr<NativeHandler>(new MutationHandler(
-      dispatcher_, v8_context, weak_ptr_factory_.GetWeakPtr()));
+scoped_ptr<NativeHandler> ContentWatcher::MakeNatives() {
+  return scoped_ptr<NativeHandler>(
+      new MutationHandler(dispatcher_, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ContentWatcher::OnWatchPages(
     const std::vector<std::string>& new_css_selectors) {
   if (new_css_selectors == css_selectors_)
     return;
 
   css_selectors_ = new_css_selectors;
 
   for (std::map<WebKit::WebFrame*,
@@ skipping 138 matching lines @@
            it = transitive_selectors.begin();
        it != transitive_selectors.end(); ++it)
     selector_strings.push_back(it->as_string());
   content::RenderView* view =
       content::RenderView::FromWebView(top_frame->view());
   view->Send(new ExtensionHostMsg_OnWatchedPageChange(
       view->GetRoutingID(), selector_strings));
 }
 
 }  // namespace extensions