Combine all suggestions factories into ContentSuggestionsServiceFactory

chrome/browser/android/ntp/ntp_snippets_bridge.cc

 // Copyright 2016 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/ntp/ntp_snippets_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/callback_android.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
-#include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/ntp_snippets_service.h"
 #include "jni/SnippetsBridge_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 26 matching lines @@
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& j_profile) {
   NTPSnippetsBridge* snippets_bridge = new NTPSnippetsBridge(env, j_profile);
   return reinterpret_cast<intptr_t>(snippets_bridge);
 }
 
 static void FetchSnippets(JNIEnv* env,
                           const JavaParamRef<jclass>& caller,
                           jboolean j_force_request) {
   Profile* profile = ProfileManager::GetLastUsedProfile();
-  NTPSnippetsServiceFactory::GetForProfile(profile)->FetchSnippets(
-      j_force_request);
+  ContentSuggestionsServiceFactory::GetForProfile(profile)
+      ->ntp_snippets_service()
+      ->FetchSnippets(j_force_request);
 }
 
 // Reschedules the fetching of snippets. Used to support different fetching
 // intervals for different times of day.
 static void RescheduleFetching(JNIEnv* env,
                                const JavaParamRef<jclass>& caller) {
   Profile* profile = ProfileManager::GetLastUsedProfile();
-  NTPSnippetsServiceFactory::GetForProfile(profile)->RescheduleFetching();
+  ContentSuggestionsServiceFactory::GetForProfile(profile)
+      ->ntp_snippets_service()
+      ->RescheduleFetching();
 }
 
 NTPSnippetsBridge::NTPSnippetsBridge(JNIEnv* env,
                                      const JavaParamRef<jobject>& j_profile)
     : content_suggestions_service_observer_(this), weak_ptr_factory_(this) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   content_suggestions_service_ =
       ContentSuggestionsServiceFactory::GetForProfile(profile);
   history_service_ =
       HistoryServiceFactory::GetForProfile(profile,
@@ skipping 127 matching lines @@
   if (!image.IsEmpty())
     j_bitmap = gfx::ConvertToJavaBitmap(image.ToSkBitmap());
 
   base::android::RunCallbackAndroid(callback, j_bitmap);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }