Avoiding use of NOTIFICATION_EXTENSION_READY_DEPRECATED

chrome/browser/background/background_mode_manager.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/background/background_mode_manager.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 32 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/options_page_info.h"
+#include "extensions/common/one_shot_event.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "components/browser_watcher/exit_funnel_win.h"
 #endif
 
 using base::UserMetricsAction;
@@ skipping 183 matching lines @@
     const base::CommandLine& command_line,
     ProfileInfoCache* profile_cache)
     : profile_cache_(profile_cache),
       status_tray_(NULL),
       status_icon_(NULL),
       context_menu_(NULL),
       in_background_mode_(false),
       keep_alive_for_startup_(false),
       keep_alive_for_test_(false),
       background_mode_suspended_(false),
-      keeping_alive_(false) {
+      keeping_alive_(false),
+      weak_factory_(this) {
   // We should never start up if there is no browser process or if we are
   // currently quitting.
   CHECK(g_browser_process != NULL);
   CHECK(!browser_shutdown::IsTryingToQuit());
 
   // Add self as an observer for the profile info cache so we know when profiles
   // are deleted and their names change.
   profile_cache_->AddObserver(this);
 
   RecordAutoLaunchState(command_line);
@@ skipping 76 matching lines @@
   // Initially set the name for this background mode data.
   size_t index = profile_cache_->GetIndexOfProfileWithPath(profile->GetPath());
   base::string16 name = l10n_util::GetStringUTF16(IDS_PROFILES_DEFAULT_NAME);
   if (index != std::string::npos)
     name = profile_cache_->GetNameOfProfileAtIndex(index);
   bmd->SetName(name);
 
   // Check for the presence of background apps after all extensions have been
   // loaded, to handle the case where an extension has been manually removed
   // while Chrome was not running.
-  registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
-                 content::Source<Profile>(profile));
+  extensions::ExtensionSystem::Get(profile)->ready().Post(
+      FROM_HERE,
+      base::Bind(&BackgroundModeManager::OnExtensionsReady,
+        weak_factory_.GetWeakPtr()));
 
   bmd->applications_->AddObserver(this);
 
   // If we're adding a new profile and running in multi-profile mode, this new
   // profile should be added to the status icon if one currently exists.
   if (in_background_mode_ && status_icon_)
     UpdateStatusTrayIconContextMenu();
 }
 
 // static
@@ skipping 12 matching lines @@
   return background_mode_data_.size();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, content::NotificationObserver overrides
 void BackgroundModeManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED:
-      // Extensions are loaded, so we don't need to manually keep the browser

[Lei Zhang, 2015/05/06 21:35:49]

Can you preseve the comment in the new code?

[Pranay, 2015/05/07 03:24:46]

Done.

-      // process alive any more when running in no-startup-window mode.
-      DecrementKeepAliveCountForStartup();
-      break;
     case chrome::NOTIFICATION_APP_TERMINATING:
       // Make sure we aren't still keeping the app alive (only happens if we
       // don't receive an EXTENSIONS_READY notification for some reason).
       DecrementKeepAliveCountForStartup();
       // Performing an explicit shutdown, so exit background mode (does nothing
       // if we aren't in background mode currently).
       EndBackgroundMode();
       // Shutting down, so don't listen for any more notifications so we don't
       // try to re-enter/exit background mode again.
       registrar_.RemoveAll();
       for (BackgroundModeInfoMap::iterator it =
                background_mode_data_.begin();
            it != background_mode_data_.end();
            ++it) {
         it->second->applications_->RemoveObserver(this);
       }
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
+void BackgroundModeManager::OnExtensionsReady() {
+  DecrementKeepAliveCountForStartup();
+}
+
 void BackgroundModeManager::OnBackgroundModeEnabledPrefChanged() {
   if (IsBackgroundModePrefEnabled())
     EnableBackgroundMode();
   else
     DisableBackgroundMode();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, BackgroundApplicationListModel::Observer overrides
 void BackgroundModeManager::OnApplicationDataChanged(
@@ skipping 474 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }