Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/profile_resetter/profile_resetter.cc

 // Copyright (c) 2013 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/profile_resetter/profile_resetter.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_source.h"
 
 ProfileResetter::ProfileResetter(Profile* profile)
     : profile_(profile),
       template_url_service_(TemplateURLServiceFactory::GetForProfile(profile_)),
       pending_reset_flags_(0),
       cookies_remover_(NULL) {
   DCHECK(CalledOnValidThread());
   DCHECK(profile_);
-  registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                 content::Source<TemplateURLService>(template_url_service_));
 }
 
 ProfileResetter::~ProfileResetter() {
   if (cookies_remover_)
     cookies_remover_->RemoveObserver(this);
 }
 
 void ProfileResetter::Reset(
     ProfileResetter::ResettableFlags resettable_flags,
     scoped_ptr<BrandcodedDefaultSettings> master_settings,
@@ skipping 49 matching lines @@
   // Check that we are never called twice or unexpectedly.
   CHECK(pending_reset_flags_ & resettable);
 
   pending_reset_flags_ &= ~resettable;
 
   if (!pending_reset_flags_) {
     content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
                                      callback_);
     callback_.Reset();
     master_settings_.reset();
+    template_url_service_sub_.reset();
   }
 }
 
 void ProfileResetter::ResetDefaultSearchEngine() {
   DCHECK(CalledOnValidThread());
   DCHECK(template_url_service_);
-
   // If TemplateURLServiceFactory is ready we can clean it right now.
   // Otherwise, load it and continue from ProfileResetter::Observe.
   if (template_url_service_->loaded()) {
     PrefService* prefs = profile_->GetPrefs();
     DCHECK(prefs);
     TemplateURLPrepopulateData::ClearPrepopulatedEnginesInPrefs(profile_);
     scoped_ptr<ListValue> search_engines(
         master_settings_->GetSearchProviderOverrides());
     if (search_engines) {
       // This Chrome distribution channel provides a custom search engine. We
       // must reset to it.
       ListPrefUpdate update(prefs, prefs::kSearchProviderOverrides);
       update->Swap(search_engines.get());
     }
 
     template_url_service_->ResetURLs();
 
     // Reset Google search URL.
     prefs->ClearPref(prefs::kLastPromptedGoogleURL);
     const TemplateURL* default_search_provider =
         template_url_service_->GetDefaultSearchProvider();
     if (default_search_provider &&
         default_search_provider->url_ref().HasGoogleBaseURLs())
       GoogleURLTracker::RequestServerCheck(profile_, true);
 
     MarkAsDone(DEFAULT_SEARCH_ENGINE);
   } else {
+    template_url_service_sub_ =
+        template_url_service_->RegisterOnLoadedCallback(
+            base::Bind(&ProfileResetter::OnTemplateURLServiceLoaded,
+                       base::Unretained(this)));
     template_url_service_->Load();
   }
 }
 
 void ProfileResetter::ResetHomepage() {
   DCHECK(CalledOnValidThread());
   PrefService* prefs = profile_->GetPrefs();
   DCHECK(prefs);
   std::string homepage;
   bool homepage_is_ntp, show_home_button;
@@ skipping 91 matching lines @@
       // reverse direction is correct.
       for (int i = tab_model->count() - 1; i >= 0; --i) {
         if (tab_model->IsTabPinned(i) && !tab_model->IsAppTab(i))
           tab_model->SetTabPinned(i, false);
       }
     }
   }
   MarkAsDone(PINNED_TABS);
 }
 
-void ProfileResetter::Observe(int type,
-                              const content::NotificationSource& source,
-                              const content::NotificationDetails& details) {
-  DCHECK(CalledOnValidThread());
+void ProfileResetter::OnTemplateURLServiceLoaded() {
   // TemplateURLService has loaded. If we need to clean search engines, it's

[Avi (use Gerrit), 2013/10/02 22:27:52]

Was the drop of the thread DCHECK intentional? Might as well leave it be.

[Cait (Slow), 2013/10/03 15:36:45]

Done.

   // time to go on.
+  template_url_service_sub_.reset();
   if (pending_reset_flags_ & DEFAULT_SEARCH_ENGINE)
     ResetDefaultSearchEngine();
 }
 
 void ProfileResetter::OnBrowsingDataRemoverDone() {
   cookies_remover_ = NULL;
   MarkAsDone(COOKIES_AND_SITE_DATA);
 }