Remove deprecated ...EXTENSION_READY... from user_script_master.cc

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"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/shared_memory.h"
 #include "base/version.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/component_extension_resource_manager.h"
 #include "extensions/browser/content_verifier.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/file_util.h"
+#include "extensions/common/one_shot_event.h"
 #include "extensions/common/message_bundle.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 using extensions::ExtensionsBrowserClient;
 
 namespace extensions {
 
 namespace {
 
@@ skipping 305 matching lines @@
 }
 
 UserScriptMaster::UserScriptMaster(Profile* profile)
     : user_scripts_(new UserScriptList()),
       extensions_service_ready_(false),
       pending_load_(false),
       profile_(profile),
       extension_registry_observer_(this),
       weak_factory_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
-  registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
-                 content::Source<Profile>(profile_));
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  content::NotificationService::AllBrowserContextsAndSources());
+  ExtensionSystem::Get(profile)->ready().Post(
+      FROM_HERE,
+      base::Bind(&UserScriptMaster::OnExtensionsReady,
+        weak_factory_.GetWeakPtr()));
 }
 
 UserScriptMaster::~UserScriptMaster() {
 }
 
 void UserScriptMaster::OnScriptsLoaded(
     scoped_ptr<UserScriptList> user_scripts,
     scoped_ptr<base::SharedMemory> shared_memory) {
   user_scripts_.reset(user_scripts.release());
   if (pending_load_) {
@@ skipping 62 matching lines @@
   changed_extensions_.insert(extension->id());
   if (is_loading())
     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 extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED:
-      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.
-      }
-      break;
-    }
-    default:
-      DCHECK(false);
-  }
-
-  if (should_start_load) {
-    if (is_loading())
-      pending_load_ = true;
-    else
-      StartLoad();
+  DCHECK_EQ(type, 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.
   }
 }
 
+void UserScriptMaster::OnExtensionsReady() {
+  extensions_service_ready_ = true;
+  if (is_loading())
+    pending_load_ = true;
+  else
+    StartLoad();
+}
+
 void UserScriptMaster::StartLoad() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!is_loading());
 
   // Remove any user scripts belonging to any extension that was updated or
   // removed.
   for (UserScriptList::iterator iter = user_scripts_->begin();
        iter != user_scripts_->end();) {
     if (removed_extensions_.count(iter->extension_id()) > 0 ||
         added_extensions_.count(iter->extension_id()) > 0) {
@@ skipping 62 matching lines @@
   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, "" /* owner */, changed_extensions));
   }
 }
 
 }  // namespace extensions