Declarative content scripts: Renderer-side: per-extension shared memory regions (lazily loaded)

extensions/renderer/user_script_set.h

Index: extensions/renderer/user_script_set.h
diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h
index 48fc641298eb4ca99cfc4d4af6269e0d6661c72f..de9822f87a9e2b8d966d91416475768ca28cd07b 100644
--- a/extensions/renderer/user_script_set.h
+++ b/extensions/renderer/user_script_set.h
@@ -31,8 +31,12 @@ class ScriptInjection;
 // The UserScriptSet is a collection of UserScripts which knows how to update
 // itself from SharedMemory and create ScriptInjections for UserScripts to
 // inject on a page.
-class UserScriptSet : public content::RenderProcessObserver {
+class UserScriptSet {
  public:
+  // Provide UserScriptSetManager with accesss to OnUpdateUserScripts and

[Jeffrey Yasskin, 2014/07/28 17:47:16]

s/accesss/access/

[Mark Dittmer, 2014/07/28 22:21:28]

Done.

+  // scripts_.
+  friend class UserScriptSetManager;

[Devlin, 2014/07/28 18:15:27]

nit: We usually put friend classes in the private: portion of a class (though it
makes no difference, I think).

That said, I think the better way to do this is to just make
OnUpdateUserScripts() a public method here - there's no reason to have it be
private anymore, even if it's only called by one class.

[Mark Dittmer, 2014/07/28 22:21:28]

Done, but this required an accessor for scripts_ as well. I don't see any
problem with that, but if you do we can revert to friending instead.

+
   class Observer {

[Devlin, 2014/07/28 18:15:27]

Is this class still needed for anything?

[Mark Dittmer, 2014/07/28 22:21:28]

Yes. The UserScriptInjector still observes each UserScriptSet individually. It
"doesn't know and doesn't care" whether a region is declarative+per-extension or
static/all-extensions. As Jeffrey pointed out elsewhere, we may choose to get
rid of this pattern later, but not in this CL.

    public:
     virtual void OnUserScriptsUpdated(
@@ -40,7 +44,7 @@ class UserScriptSet : public content::RenderProcessObserver {
         const std::vector<UserScript*>& scripts) = 0;
   };
 
-  UserScriptSet(const ExtensionSet* extensions);
+  explicit UserScriptSet(const ExtensionSet* extensions);
   virtual ~UserScriptSet();
 
   // Adds or removes observers.
@@ -60,11 +64,10 @@ class UserScriptSet : public content::RenderProcessObserver {
                      UserScript::RunLocation run_location);
 
  private:
-  // content::RenderProcessObserver implementation.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
-
-  // Handle the UpdateUserScripts extension message.
-  void OnUpdateUserScripts(base::SharedMemoryHandle shared_memory,
+  // Handle the UpdateUserScripts extension message. Return true if the
+  // method follows through on notifying observers of the change, or false if
+  // an error occurred.
+  bool OnUpdateUserScripts(base::SharedMemoryHandle shared_memory,
                            const std::set<std::string>& changed_extensions);
 
   // Update the parsed scripts from |shared memory|.