Split WarningService from ExtensionSystem.

chrome/browser/extensions/extension_warning_badge_service.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/extension_warning_badge_service.h"
 
 #include "base/stl_util.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/extensions/extension_warning_badge_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/grit/generated_resources.h"
-#include "extensions/browser/extension_system.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace {
 // Non-modal GlobalError implementation that warns the user if extensions
 // created warnings or errors. If the user clicks on the wrench menu, the user
 // is redirected to chrome://extensions to inspect the errors.
 class ErrorBadge : public GlobalError {
  public:
@@ skipping 54 matching lines @@
   return NULL;
 }
 
 // static
 int ErrorBadge::GetMenuItemCommandID() {
   return IDC_EXTENSION_ERRORS;
 }
 
 }  // namespace
 
-
 ExtensionWarningBadgeService::ExtensionWarningBadgeService(Profile* profile)
-    : profile_(profile) {
+    : profile_(profile), warning_service_observer_(this) {
   DCHECK(CalledOnValidThread());
+  warning_service_observer_.Add(WarningService::Get(profile_));

[Marijn Kruisselbrink, 2014/10/31 20:38:09]

The old code removed this observer in the Shutdown stage of KeyedService, while
your new code does this in the destructor stage. I'm not sure why the old code
did that though, as I can't think of any case where the two stage shutdown would
be necessary for this particular dependency, so it's probably okay to keep it
like this.
(actually, I can see why the old code needed it; the order of those data members
in ExtensionSystemImpl::Shared would have caused them to be destroyed in the
wrong order)

 }
 
 ExtensionWarningBadgeService::~ExtensionWarningBadgeService() {}
 
+// static
+ExtensionWarningBadgeService* ExtensionWarningBadgeService::Get(
+    content::BrowserContext* context) {
+  return ExtensionWarningBadgeServiceFactory::GetForBrowserContext(context);
+}
+
 void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
   DCHECK(CalledOnValidThread());
   size_t old_size = suppressed_warnings_.size();
 
   const WarningSet& warnings = GetCurrentWarnings();
   suppressed_warnings_.insert(warnings.begin(), warnings.end());
 
   if (old_size != suppressed_warnings_.size())
     UpdateBadgeStatus();
 }
 
 const WarningSet& ExtensionWarningBadgeService::GetCurrentWarnings() const {
-  return ExtensionSystem::Get(profile_)->warning_service()->warnings();
+  return WarningService::Get(profile_)->warnings();
 }
 
 void ExtensionWarningBadgeService::ExtensionWarningsChanged() {
   DCHECK(CalledOnValidThread());
   UpdateBadgeStatus();
 }
 
 void ExtensionWarningBadgeService::UpdateBadgeStatus() {
   const std::set<Warning>& warnings = GetCurrentWarnings();
   bool non_suppressed_warnings_exist = false;
@@ skipping 16 matching lines @@
   // Activate or hide the warning badge in case the current state is incorrect.
   if (error && !show) {
     service->RemoveGlobalError(error);
     delete error;
   } else if (!error && show) {
     service->AddGlobalError(new ErrorBadge(this));
   }
 }
 
 }  // namespace extensions