[Offline Pages] Delete associated page along with bookmark.

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 96 matching lines @@
 #include "extensions/browser/event_router_factory.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/extension_prefs_observer.h"
 #include "extensions/browser/extension_system.h"
 #endif
 
 #if defined(OS_ANDROID)
+#include "chrome/browser/android/offline_pages/offline_page_bookmark_observer.h"
 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_pref_store.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
 #endif
 
@@ skipping 83 matching lines @@
                            TemplateURLServiceFactory::GetForProfile(profile),
                            content::BrowserThread::GetBlockingPool(),
                            profile->GetPath(), SchemeSet()));
   in_memory_url_index->Init();
   return std::move(in_memory_url_index);
 }
 
 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::BookmarkModelObserver> offline_page_observer =
+      nullptr;
+#if defined(OS_ANDROID)
+  offline_page_observer =
+      base::MakeUnique<offline_pages::OfflinePageBookmarkObserver>(profile);
+#endif
+  std::unique_ptr<BookmarkModel> bookmark_model(new BookmarkModel(
+      base::WrapUnique(new ChromeBookmarkClient(

[Dmitry Titov, 2016/08/26 23:08:59]

Since you touch this code, the style guide now says prefer MakeUnique<Foo>()
instead of WrapUnique(new Foo()).

[romax, 2016/08/29 22:58:02]

Done.

+          profile, ManagedBookmarkServiceFactory::GetForProfile(profile))),
+      std::move(offline_page_observer)));
   bookmark_model->Load(profile->GetPrefs(), profile->GetPath(),
                        profile->GetIOTaskRunner(),
                        content::BrowserThread::GetTaskRunnerForThread(
                            content::BrowserThread::UI));
   return std::move(bookmark_model);
 }
 
 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type,
                               sql::InitStatus status,
                               const std::string& diagnostics) {
@@ skipping 836 matching lines @@
   // Note: Owned by |original_profile|.
   return new TestingProfile(path_, delegate_,
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             std::move(pref_service_), original_profile,
                             guest_session_, supervised_user_id_,
                             std::move(policy_service_), testing_factories_,
                             profile_name_);
 }