Renderer changes for wiring up shared memory with declarative injection

extensions/renderer/user_script_set_manager.h

Index: extensions/renderer/user_script_set_manager.h
diff --git a/extensions/renderer/user_script_set_manager.h b/extensions/renderer/user_script_set_manager.h
index 335312ccfa6afae977f9589084c11a8546d733d1..f99ce89a4e528b7035aa3cc9c8a8eefbb49bd496 100644
--- a/extensions/renderer/user_script_set_manager.h
+++ b/extensions/renderer/user_script_set_manager.h
@@ -56,8 +56,13 @@ class UserScriptSetManager : public content::RenderProcessObserver {
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  const UserScriptSet* GetProgrammaticScriptsByExtension(
-      const ExtensionId& extensionId);
+  scoped_ptr<ScriptInjection> GetInjectionForScript(

[Devlin, 2014/08/21 17:06:17]

comments

+      int64 script_id,
+      blink::WebFrame* web_frame,
+      int tab_id,
+      UserScript::RunLocation run_location,
+      const GURL& url,
+      const Extension* extension);
 
   // Put all injections from |static_scripts| and each of
   // |programmatic_scripts_| into |injections|.
@@ -73,12 +78,20 @@ class UserScriptSetManager : public content::RenderProcessObserver {
   const UserScriptSet* static_scripts() const { return &static_scripts_; }
 
  private:
+  // A RenderViewObserver implementation which watches the various render views

[Devlin, 2014/08/21 17:06:17]

Why?

[Mark Dittmer, 2014/08/23 12:21:39]

More leftovers from a failed/unnecessary pattern I tried. Removed.

+  // in order to notify the ScriptInjectionManager of different document load
+  // states.
+  class RVOHelper;
+
   // Map for per-extension sets that may be defined programmatically.
   typedef std::map<ExtensionId, linked_ptr<UserScriptSet> > UserScriptSetMap;
 
   // content::RenderProcessObserver implementation.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
 
+  UserScriptSet* GetProgrammaticScriptsByExtension(
+      const ExtensionId& extensionId);
+
   // Handle the UpdateUserScripts extension message.
   void OnUpdateUserScripts(base::SharedMemoryHandle shared_memory,
                            const ExtensionId& extension_id,