| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 943b927e2c7b13d187010018dfd507a7fce8f391..662eef1f8ac06bcb97230496348e199491fb2fce 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -114,6 +114,7 @@
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
| +#include "chrome/browser/android/offline_pages/offline_page_bookmark_observer_impl.h"
|
| #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
|
| #endif
|
|
|
| @@ -217,9 +218,16 @@ std::unique_ptr<KeyedService> BuildInMemoryURLIndex(
|
| std::unique_ptr<KeyedService> BuildBookmarkModel(
|
| content::BrowserContext* context) {
|
| Profile* profile = Profile::FromBrowserContext(context);
|
| - std::unique_ptr<BookmarkModel> bookmark_model(
|
| - new BookmarkModel(base::WrapUnique(new ChromeBookmarkClient(
|
| - profile, ManagedBookmarkServiceFactory::GetForProfile(profile)))));
|
| + std::unique_ptr<bookmarks::OfflinePageBookmarkObserver>
|
| + offline_page_observer = nullptr;
|
| +#if defined(OS_ANDROID)
|
| + offline_page_observer =
|
| + base::MakeUnique<offline_pages::OfflinePageBookmarkObserverImpl>(profile);
|
| +#endif
|
| + std::unique_ptr<BookmarkModel> bookmark_model(new BookmarkModel(
|
| + base::MakeUnique<ChromeBookmarkClient>(
|
| + profile, ManagedBookmarkServiceFactory::GetForProfile(profile)),
|
| + std::move(offline_page_observer)));
|
| bookmark_model->Load(profile->GetPrefs(), profile->GetPath(),
|
| profile->GetIOTaskRunner(),
|
| content::BrowserThread::GetTaskRunnerForThread(
|
|
|