| Index: chrome/browser/search/suggestions/suggestions_service_factory.cc
|
| diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.cc b/chrome/browser/search/suggestions/suggestions_service_factory.cc
|
| index e16b07043fddb1664b70f159ef10b3607198c8ef..4a98018a237455c7f7f9303262aefff74013e4cd 100644
|
| --- a/chrome/browser/search/suggestions/suggestions_service_factory.cc
|
| +++ b/chrome/browser/search/suggestions/suggestions_service_factory.cc
|
| @@ -8,12 +8,13 @@
|
| #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_manager_impl.h"
|
| +#include "chrome/browser/search/suggestions/image_fetcher_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"
|
| @@ -66,18 +67,19 @@ KeyedService* SuggestionsServiceFactory::BuildServiceInstanceFor(
|
| 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<ImageManagerImpl> thumbnail_manager(new ImageManagerImpl(
|
| - the_profile->GetRequestContext(),
|
| + scoped_ptr<ImageFetcherImpl> image_fetcher(
|
| + new ImageFetcherImpl(the_profile->GetRequestContext()));
|
| + scoped_ptr<ImageManager> thumbnail_manager(new ImageManager(
|
| + image_fetcher.PassAs<ImageFetcher>(),
|
| db.PassAs<leveldb_proto::ProtoDatabase<ImageData> >(), database_dir));
|
| return new SuggestionsService(
|
| the_profile->GetRequestContext(), suggestions_store.Pass(),
|
| - thumbnail_manager.PassAs<ImageManager>(), blacklist_store.Pass());
|
| + thumbnail_manager.Pass(), blacklist_store.Pass());
|
| }
|
|
|
| void SuggestionsServiceFactory::RegisterProfilePrefs(
|
|
|