Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/search_engines/template_url_service_android.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/search_engines/template_url_service_android.h"
 
 #include "base/android/jni_string.h"
+#include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.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 "content/public/browser/notification_source.h"
 #include "jni/TemplateUrlService_jni.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 
 namespace {
 
 Profile* GetOriginalProfile() {
   return g_browser_process->profile_manager()->GetDefaultProfile()->
       GetOriginalProfile();
 }
 
 }  // namespace
 
 TemplateUrlServiceAndroid::TemplateUrlServiceAndroid(JNIEnv* env,
                                                      jobject obj)
     : weak_java_obj_(env, obj),
       template_url_service_(
           TemplateURLServiceFactory::GetForProfile(GetOriginalProfile())) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                 content::Source<TemplateURLService>(template_url_service_));
+  if (template_url_service_) {
+    template_url_subscription_ =
+        template_url_service_->RegisterOnLoadedCallback(
+            base::Bind(&TemplateUrlServiceAndroid::OnTemplateURLServiceLoaded,
+                       base::Unretained(this)));
+  }
 }
 
 TemplateUrlServiceAndroid::~TemplateUrlServiceAndroid() {
 }
 
-void TemplateUrlServiceAndroid::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED, type);
-  JNIEnv* env = base::android::AttachCurrentThread();
-  if (weak_java_obj_.get(env).is_null())
-    return;
-
-  Java_TemplateUrlService_templateUrlServiceLoaded(env,
-      weak_java_obj_.get(env).obj());
-}
-
 void TemplateUrlServiceAndroid::Load(JNIEnv* env, jobject obj) {
   template_url_service_->Load();
 }
 
 void TemplateUrlServiceAndroid::SetDefaultSearchProvider(JNIEnv* env,
                                                          jobject obj,
                                                          jint selected_index) {
   std::vector<TemplateURL*> template_urls =
       template_url_service_->GetTemplateURLs();
   size_t selected_index_size_t = static_cast<size_t>(selected_index);
@@ skipping 62 matching lines @@
       env,
       index,
       ConvertUTF16ToJavaString(env, template_url->short_name()).obj(),
       ConvertUTF16ToJavaString(env, template_url->keyword()).obj());
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {
   return url->prepopulate_id() > 0;
 }
 
+void TemplateUrlServiceAndroid::OnTemplateURLServiceLoaded() {
+  template_url_subscription_.reset();
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (weak_java_obj_.get(env).is_null())
+    return;
+
+  Java_TemplateUrlService_templateUrlServiceLoaded(env,

[Peter Kasting, 2013/10/02 22:22:04]

Nit: Move this arg to the next line so we don't have 2 lines of args that begin
at different columns

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

Done.

+      weak_java_obj_.get(env).obj());
+}
+
 base::android::ScopedJavaLocalRef<jstring>
 TemplateUrlServiceAndroid::GetUrlForSearchQuery(JNIEnv* env,
                                                 jobject obj,
                                                 jstring jquery) {
   const TemplateURL* default_provider =
       template_url_service_->GetDefaultSearchProvider();
 
   string16 query(ConvertJavaStringToUTF16(env, jquery));
 
   std::string url;
@@ skipping 29 matching lines @@
 static jint Init(JNIEnv* env, jobject obj) {
   TemplateUrlServiceAndroid* template_url_service_android =
       new TemplateUrlServiceAndroid(env, obj);
   return reinterpret_cast<jint>(template_url_service_android);
 }
 
 // static
 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }