Make GlobalErrorService's ownership model slightly less insane.

chrome/browser/recovery/recovery_install_global_error.cc

 // Copyright (c) 2014 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/recovery/recovery_install_global_error.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/recovery_component_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 RecoveryInstallGlobalError::RecoveryInstallGlobalError(Profile* profile)
         : elevation_needed_(false),
           profile_(profile),
           has_shown_bubble_view_(false) {
-  GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(this);
+  GlobalErrorServiceFactory::GetForProfile(profile_)->AddUnownedGlobalError(
+      this);
 
   PrefService* pref = g_browser_process->local_state();
   if (pref->FindPreference(prefs::kRecoveryComponentNeedsElevation)) {
     elevation_needed_ =
         pref->GetBoolean(prefs::kRecoveryComponentNeedsElevation);
   }
   if (elevation_needed_) {
     GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(
         this);
   }
 
   pref_registrar_.Init(pref);
   pref_registrar_.Add(
       prefs::kRecoveryComponentNeedsElevation,
       base::Bind(&RecoveryInstallGlobalError::OnElevationRequirementChanged,
                  base::Unretained(this)));
 }
 
 RecoveryInstallGlobalError::~RecoveryInstallGlobalError() {
 }
 
 void RecoveryInstallGlobalError::Shutdown() {
-  GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
+  GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveUnownedGlobalError(
+      this);
 }
 
 GlobalError::Severity RecoveryInstallGlobalError::GetSeverity() {
   return GlobalError::SEVERITY_HIGH;
 }
 
 bool RecoveryInstallGlobalError::HasMenuItem() {
   return HasElevationNotification();
 }
 
@@ skipping 85 matching lines @@
   DCHECK(pref->FindPreference(prefs::kRecoveryComponentNeedsElevation));
   elevation_needed_ = pref->GetBoolean(prefs::kRecoveryComponentNeedsElevation);
 
   // Got a new elevation request, resets |has_shown_bubble_view_| so the
   // bubble has a higher priority to show.
   if (elevation_needed_)
     has_shown_bubble_view_ = false;
 
   GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this);
 }