Revert 273866 "Block content scripts from executing until user g..."

trunk/src/chrome/browser/extensions/user_script_master.cc

Index: trunk/src/chrome/browser/extensions/user_script_master.cc
===================================================================
--- trunk/src/chrome/browser/extensions/user_script_master.cc	(revision 274101)
+++ trunk/src/chrome/browser/extensions/user_script_master.cc	(working copy)
@@ -389,11 +389,8 @@
     for (content::RenderProcessHost::iterator i(
             content::RenderProcessHost::AllHostsIterator());
          !i.IsAtEnd(); i.Advance()) {
-      SendUpdate(i.GetCurrentValue(),
-                 shared_memory_.get(),
-                 changed_extensions_);
+      SendUpdate(i.GetCurrentValue(), shared_memory_.get());
     }
-    changed_extensions_.clear();
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
@@ -424,7 +421,6 @@
     user_scripts_.back().set_incognito_enabled(incognito_enabled);
   }
   if (extensions_service_ready_) {
-    changed_extensions_.insert(extension->id());
     if (script_reloader_.get()) {
       pending_load_ = true;
     } else {
@@ -447,7 +443,6 @@
       new_user_scripts.push_back(*iter);
   }
   user_scripts_ = new_user_scripts;
-  changed_extensions_.insert(extension->id());
   if (script_reloader_.get()) {
     pending_load_ = true;
   } else {
@@ -471,11 +466,8 @@
           process->GetBrowserContext());
       if (!profile_->IsSameProfile(profile))
         return;
-      if (ScriptsReady()) {
-        SendUpdate(process,
-                   GetSharedMemory(),
-                   std::set<std::string>());  // Include all extensions.
-      }
+      if (ScriptsReady())
+        SendUpdate(process, GetSharedMemory());
       break;
     }
     default:
@@ -498,10 +490,8 @@
   script_reloader_->StartLoad(user_scripts_, extensions_info_);
 }
 
-void UserScriptMaster::SendUpdate(
-    content::RenderProcessHost* process,
-    base::SharedMemory* shared_memory,
-    const std::set<std::string>& changed_extensions) {
+void UserScriptMaster::SendUpdate(content::RenderProcessHost* process,
+                                  base::SharedMemory* shared_memory) {
   // Don't allow injection of content scripts into <webview>.
   if (process->IsIsolatedGuest())
     return;
@@ -521,10 +511,8 @@
   if (!shared_memory->ShareToProcess(handle, &handle_for_process))
     return;  // This can legitimately fail if the renderer asserts at startup.
 
-  if (base::SharedMemory::IsHandleValid(handle_for_process)) {
-    process->Send(new ExtensionMsg_UpdateUserScripts(handle_for_process,
-                                                     changed_extensions));
-  }
+  if (base::SharedMemory::IsHandleValid(handle_for_process))
+    process->Send(new ExtensionMsg_UpdateUserScripts(handle_for_process));
 }
 
 }  // namespace extensions