Topsites become keyedService based.

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 11 matching lines @@
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/android/sqlite_cursor.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/history/core/android/android_history_types.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 1116 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 ChromeBrowserProvider::ChromeBrowserProvider(JNIEnv* env, jobject obj)
     : weak_java_provider_(env, obj),
       history_service_observer_(this),
       handling_extensive_changes_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_ = g_browser_process->profile_manager()->GetLastUsedProfile();
   bookmark_model_ = BookmarkModelFactory::GetForProfile(profile_);
-  top_sites_ = profile_->GetTopSites();
+  top_sites_ = TopSitesFactory::GetForProfile(profile_);
   favicon_service_ = FaviconServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS),
   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());
@@ skipping 388 matching lines @@
 }
 
 ScopedJavaLocalRef<jbyteArray> ChromeBrowserProvider::GetThumbnail(
     JNIEnv* env, jobject obj, jstring jurl) {
   if (!jurl)
     return ScopedJavaLocalRef<jbyteArray>();
   GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
 
   // GetPageThumbnail is synchronous and can be called from any thread.
   scoped_refptr<base::RefCountedMemory> thumbnail;
-  if (top_sites_)
+  if (top_sites_.get())

[Bernhard Bauer, 2015/01/08 10:22:04]

Remove the .get().

[Jitu( very slow this week), 2015/01/12 11:30:07]

Done.

     top_sites_->GetPageThumbnail(url, false, &thumbnail);
 
   if (!thumbnail.get() || !thumbnail->front()) {
     return ScopedJavaLocalRef<jbyteArray>();
   }
 
   return base::android::ToJavaByteArray(env, thumbnail->front(),
       thumbnail->size());
 }
 
@@ skipping 46 matching lines @@
     OnHistoryChanged();
   } else if (type ==
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   }
 }