Move most of ChromeV8Context to a base ScriptContext

chrome/renderer/extensions/render_view_observer_natives.cc

 // Copyright 2013 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/render_view_observer_natives.h"
 
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "extensions/common/extension_api.h"
+#include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
 namespace extensions {
 
 namespace {
 
 // Deletes itself when done.
 class LoadWatcher : public content::RenderViewObserver {
  public:
-  LoadWatcher(ChromeV8Context* context,
+  LoadWatcher(ScriptContext* context,
               content::RenderView* view,
               v8::Handle<v8::Function> cb)
-      : content::RenderViewObserver(view),
-        context_(context),
-        callback_(cb) {
-  }
+      : content::RenderViewObserver(view), context_(context), callback_(cb) {}
 
   virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE {
     CallbackAndDie(true);
   }
 
   virtual void DidFailProvisionalLoad(
       blink::WebLocalFrame* frame,
       const blink::WebURLError& error) OVERRIDE {
     CallbackAndDie(false);
   }
 
  private:
   void CallbackAndDie(bool succeeded) {
     v8::Isolate* isolate = context_->isolate();
     v8::HandleScope handle_scope(isolate);
     v8::Handle<v8::Value> args[] = { v8::Boolean::New(isolate, succeeded) };
     context_->CallFunction(callback_.NewHandle(isolate), 1, args);
     delete this;
   }
 
-  ChromeV8Context* context_;
+  ScriptContext* context_;
   ScopedPersistent<v8::Function> callback_;
   DISALLOW_COPY_AND_ASSIGN(LoadWatcher);
 };
 }  // namespace
 
 
 RenderViewObserverNatives::RenderViewObserverNatives(Dispatcher* dispatcher,
                                                      ChromeV8Context* context)
     : ChromeV8Extension(dispatcher, context) {
   RouteFunction("OnDocumentElementCreated",
@@ skipping 14 matching lines @@
     LOG(WARNING) << "No render view found to register LoadWatcher.";
     return;
   }
 
   new LoadWatcher(context(), view, args[1].As<v8::Function>());
 
   args.GetReturnValue().Set(true);
 }
 
 }  // namespace extensions