Revert of [Suggestions] Move ImageManager to the component

chrome/browser/search/suggestions/suggestions_service_factory.cc

 // Copyright 2014 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/suggestions/suggestions_service_factory.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search/suggestions/image_fetcher_impl.h"
+#include "chrome/browser/search/suggestions/image_manager_impl.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/leveldb_proto/proto_database_impl.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/suggestions/blacklist_store.h"
-#include "components/suggestions/image_fetcher.h"
 #include "components/suggestions/image_manager.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/suggestions/suggestions_service.h"
 #include "components/suggestions/suggestions_store.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace suggestions {
@@ skipping 32 matching lines @@
       BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
           BrowserThread::GetBlockingPool()->GetSequenceToken());
 
   Profile* the_profile = static_cast<Profile*>(profile);
   scoped_ptr<SuggestionsStore> suggestions_store(
       new SuggestionsStore(the_profile->GetPrefs()));
   scoped_ptr<BlacklistStore> blacklist_store(
       new BlacklistStore(the_profile->GetPrefs()));
 
   scoped_ptr<leveldb_proto::ProtoDatabaseImpl<ImageData> > db(
-      new leveldb_proto::ProtoDatabaseImpl<ImageData>(background_task_runner));
+      new leveldb_proto::ProtoDatabaseImpl<ImageData>(
+          background_task_runner));
 
   base::FilePath database_dir(
       the_profile->GetPath().Append(FILE_PATH_LITERAL("Thumbnails")));
 
-  scoped_ptr<ImageFetcherImpl> image_fetcher(
-      new ImageFetcherImpl(the_profile->GetRequestContext()));
-  scoped_ptr<ImageManager> thumbnail_manager(new ImageManager(
-      image_fetcher.PassAs<ImageFetcher>(),
+  scoped_ptr<ImageManagerImpl> thumbnail_manager(new ImageManagerImpl(
+      the_profile->GetRequestContext(),
       db.PassAs<leveldb_proto::ProtoDatabase<ImageData> >(), database_dir));
   return new SuggestionsService(
       the_profile->GetRequestContext(), suggestions_store.Pass(),
-      thumbnail_manager.Pass(), blacklist_store.Pass());
+      thumbnail_manager.PassAs<ImageManager>(), blacklist_store.Pass());
 }
 
 void SuggestionsServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   SuggestionsService::RegisterProfilePrefs(registry);
 }
 
 }  // namespace suggestions