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

extensions/renderer/user_script_set.cc

Index: extensions/renderer/user_script_set.cc
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index 5ab873955f026e98159d5567a4c111821d130c98..a3df819c269adea454e97111aeb03354f6306963 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -36,7 +36,6 @@ GURL GetDocumentUrlForFrame(blink::WebFrame* frame) {
 
 UserScriptSet::UserScriptSet(const ExtensionSet* extensions)
     : extensions_(extensions) {
-  content::RenderThread::Get()->AddObserver(this);
 }
 
 UserScriptSet::~UserScriptSet() {
@@ -79,22 +78,12 @@ void UserScriptSet::GetInjections(
   }
 }
 
-bool UserScriptSet::OnControlMessageReceived(
-    const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(UserScriptSet, message)
-    IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateUserScripts, OnUpdateUserScripts)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void UserScriptSet::OnUpdateUserScripts(
+bool UserScriptSet::OnUpdateUserScripts(
     base::SharedMemoryHandle shared_memory,
     const std::set<std::string>& changed_extensions) {
   if (!base::SharedMemory::IsHandleValid(shared_memory)) {
     NOTREACHED() << "Bad scripts handle";
-    return;
+    return false;
   }
 
   for (std::set<std::string>::const_iterator iter = changed_extensions.begin();
@@ -102,15 +91,18 @@ void UserScriptSet::OnUpdateUserScripts(
        ++iter) {
     if (!Extension::IdIsValid(*iter)) {
       NOTREACHED() << "Invalid extension id: " << *iter;
-      return;
+      return false;
     }
   }
 
-  if (UpdateScripts(shared_memory)) {
-    FOR_EACH_OBSERVER(Observer,
-                      observers_,
-                      OnUserScriptsUpdated(changed_extensions, scripts_.get()));
+  if (!UpdateScripts(shared_memory)) {

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

nit: no brackets on single-line ifs.

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

Done.

+    return false;
   }
+
+  FOR_EACH_OBSERVER(Observer,
+                    observers_,
+                    OnUserScriptsUpdated(changed_extensions, scripts_.get()));

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

I wonder if it'll make sense to remove OnUserScriptsUpdated from UserScriptSet
entirely, in favor of observing the UserScriptSetManager. No need in this patch.

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

Acknowledged.

+  return true;
 }
 
 bool UserScriptSet::UpdateScripts(