Remove ChromeV8Extension & most of ChromeV8Context

chrome/renderer/extensions/dispatcher.h

 // 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.
 
 #ifndef CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_
 #define CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/shared_memory.h"
 #include "base/timer/timer.h"
-#include "chrome/renderer/extensions/chrome_v8_context.h"
-#include "chrome/renderer/extensions/chrome_v8_context_set.h"
-#include "chrome/renderer/extensions/v8_schema_registry.h"
 #include "chrome/renderer/resource_bundle_source_map.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "extensions/common/event_filter.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/feature.h"
+#include "extensions/renderer/script_context.h"
+#include "extensions/renderer/script_context_set.h"
+#include "extensions/renderer/v8_schema_registry.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "v8/include/v8.h"
 
 class ChromeRenderViewTest;
 class GURL;
 class ModuleSystem;
 class URLPattern;
 struct ExtensionMsg_ExternalConnectionInfo;
 struct ExtensionMsg_Loaded_Params;
@@ skipping 29 matching lines @@
  public:
   Dispatcher();
   virtual ~Dispatcher();
 
   const std::set<std::string>& function_names() const {
     return function_names_;
   }
 
   bool is_extension_process() const { return is_extension_process_; }
   const ExtensionSet* extensions() const { return &extensions_; }
-  const ChromeV8ContextSet& v8_context_set() const {
-    return v8_context_set_;
+  const ScriptContextSet& script_context_set() const {

[not at google - send to devlin, 2014/04/17 15:11:10]

looks like there are a number of places that only need a Dispatcher in order to
access this. it would be nice to change those to take a ScriptContextSet
instead.

+    return script_context_set_;
   }
   UserScriptSlave* user_script_slave() {
     return user_script_slave_.get();
   }
   V8SchemaRegistry* v8_schema_registry() {
     return v8_schema_registry_.get();
   }
   ContentWatcher* content_watcher() {
     return content_watcher_.get();
   }
@@ skipping 128 matching lines @@
       const URLPatternSet& origins);
 
   // Enable custom element whitelist in Apps.
   void EnableCustomElementWhiteList();
 
   // Adds or removes bindings for every context belonging to |extension_id|, or
   // or all contexts if |extension_id| is empty.
   void AddOrRemoveBindings(const std::string& extension_id);
 
   void RegisterNativeHandlers(ModuleSystem* module_system,
-                              ChromeV8Context* context);
-  void AddOrRemoveBindingsForContext(ChromeV8Context* context);
-  void RegisterBinding(const std::string& api_name,
-                       ChromeV8Context* context);
+                              ScriptContext* context);
+  void AddOrRemoveBindingsForContext(ScriptContext* context);
+  void RegisterBinding(const std::string& api_name, ScriptContext* context);
   v8::Handle<v8::Object> GetOrCreateBindObjectIfAvailable(
       const std::string& api_name,
       std::string* bind_name,
-      ChromeV8Context* context);
+      ScriptContext* context);
 
   // Inserts static source code into |source_map_|.
   void PopulateSourceMap();
 
   // Inserts BindingInstallers into |lazy_bindings_map_|.
   void PopulateLazyBindingsMap();
 
   // Sets up the bindings for the given api.
   void InstallBindings(ModuleSystem* module_system,
                        v8::Handle<v8::Context> v8_context,
@@ skipping 24 matching lines @@
   // counterpart to ExtensionService in the browser. It contains information
   // about all extensions currently loaded by the browser.
   ExtensionSet extensions_;
 
   // The IDs of extensions that failed to load, mapped to the error message
   // generated on failure.
   std::map<std::string, std::string> extension_load_errors_;
 
   // All the bindings contexts that are currently loaded for this renderer.
   // There is zero or one for each v8 context.
-  ChromeV8ContextSet v8_context_set_;
+  ScriptContextSet script_context_set_;
 
   scoped_ptr<UserScriptSlave> user_script_slave_;
 
   scoped_ptr<ContentWatcher> content_watcher_;
 
   // Same as above, but on a longer timer and will run even if the process is
   // not idle, to ensure that IdleHandle gets called eventually.
   scoped_ptr<base::RepeatingTimer<content::RenderThread> > forced_idle_timer_;
 
   // All declared function names.
@@ skipping 29 matching lines @@
 
   // Mapping of port IDs to tabs. If there is no tab, the value would be -1.
   std::map<int, int> port_to_tab_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_