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

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

 // 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.
 
 #include "chrome/browser/extensions/user_script_master.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 371 matching lines @@
       // Pretend the extension change didn't happen.
       return;
     }
 
     // We've got scripts ready to go.
     shared_memory_ = handle.Pass();
 
     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,
         content::Source<Profile>(profile_),
         content::Details<base::SharedMemory>(shared_memory_.get()));
   }
 }
 
 ContentVerifier* UserScriptMaster::content_verifier() {
   ExtensionSystem* system = ExtensionSystem::Get(profile_);
@@ skipping 10 matching lines @@
   bool incognito_enabled = util::IsIncognitoEnabled(extension->id(), profile_);
   const UserScriptList& scripts =
       ContentScriptsInfo::GetContentScripts(extension);
   for (UserScriptList::const_iterator iter = scripts.begin();
        iter != scripts.end();
        ++iter) {
     user_scripts_.push_back(*iter);
     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 {
       StartLoad();
     }
   }
 }
 
 void UserScriptMaster::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   // Remove any content scripts.
   extensions_info_.erase(extension->id());
   UserScriptList new_user_scripts;
   for (UserScriptList::iterator iter = user_scripts_.begin();
        iter != user_scripts_.end();
        ++iter) {
     if (iter->extension_id() != extension->id())
       new_user_scripts.push_back(*iter);
   }
   user_scripts_ = new_user_scripts;
-  changed_extensions_.insert(extension->id());
   if (script_reloader_.get()) {
     pending_load_ = true;
   } else {
     StartLoad();
   }
 }
 
 void UserScriptMaster::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   bool should_start_load = false;
   switch (type) {
     case chrome::NOTIFICATION_EXTENSIONS_READY:
       extensions_service_ready_ = true;
       should_start_load = true;
       break;
     case content::NOTIFICATION_RENDERER_PROCESS_CREATED: {
       content::RenderProcessHost* process =
           content::Source<content::RenderProcessHost>(source).ptr();
       Profile* profile = Profile::FromBrowserContext(
           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:
       DCHECK(false);
   }
 
   if (should_start_load) {
     if (script_reloader_.get()) {
       pending_load_ = true;
     } else {
       StartLoad();
     }
   }
 }
 
 void UserScriptMaster::StartLoad() {
   if (!script_reloader_.get())
     script_reloader_ = new ScriptReloader(this);
 
   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;
 
   Profile* profile = Profile::FromBrowserContext(process->GetBrowserContext());
   // Make sure we only send user scripts to processes in our profile.
   if (!profile_->IsSameProfile(profile))
     return;
 
   // If the process is being started asynchronously, early return.  We'll end up
   // calling InitUserScripts when it's created which will call this again.
   base::ProcessHandle handle = process->GetHandle();
   if (!handle)
     return;
 
   base::SharedMemoryHandle handle_for_process;
   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