Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h"
 
 #include <cmath>
 #include <list>
 #include <utility>
 
@@ skipping 1154 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_ = g_browser_process->profile_manager()->GetLastUsedProfile();
   bookmark_model_ = BookmarkModelFactory::GetForProfile(profile_);
   top_sites_ = profile_->GetTopSites();
   service_.reset(new AndroidHistoryProviderService(profile_));
 
   // Registers the notifications we are interested.
   bookmark_model_->AddObserver(this);
   history_service_observer_.Add(
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS));
-  notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                              content::NotificationService::AllSources());
   notification_registrar_.Add(this,
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED,
       content::NotificationService::AllSources());
   TemplateURLService* template_service =
         TemplateURLServiceFactory::GetForProfile(profile_);
   if (!template_service->loaded())
     template_service->Load();
 }
 
 ChromeBrowserProvider::~ChromeBrowserProvider() {
   bookmark_model_->RemoveObserver(this);
 }
 
 void ChromeBrowserProvider::Destroy(JNIEnv*, jobject) {
+  history_service_observer_.RemoveAll();
   delete this;
 }
 
 // ------------- Provider public APIs ------------- //
 
 jlong ChromeBrowserProvider::AddBookmark(JNIEnv* env,
                                          jobject,
                                          jstring jurl,
                                          jstring jtitle,
                                          jboolean is_folder,
@@ skipping 415 matching lines @@
 }
 
 void ChromeBrowserProvider::OnURLVisited(HistoryService* history_service,
                                          ui::PageTransition transition,
                                          const history::URLRow& row,
                                          const history::RedirectList& redirects,
                                          base::Time visit_time) {
   OnHistoryChanged();
 }
 
+void ChromeBrowserProvider::OnURLsDeleted(
+    HistoryService* history_service,
+    const history::URLsDeletedDetails& deleted_details) {
+  OnHistoryChanged();
+}
+
 void ChromeBrowserProvider::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
-    OnHistoryChanged();
-  } else if (type ==
-      chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
+  if (type == chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {

[sdefresne, 2014/12/04 17:21:12]

Since this is now the last notification that use content::NotificationObserver,
change this to

DCHECK_EQ(type, chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED);

[nshaik, 2014/12/07 09:34:49]

Done.

     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   }
 }