[Offline Pages] Delete associated page along with bookmark.

chrome/browser/bookmarks/bookmark_model_factory.cc

Index: chrome/browser/bookmarks/bookmark_model_factory.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index 079bf75634ea5624a808522027f5303a8ee5bf0e..d76d2531d76b0d8f32eed02820ddc7101b83fa7c 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -22,10 +22,16 @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/startup_task_runner_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/offline_pages/offline_page_bookmark_observer.h"
+#include "components/offline_pages/offline_page_model.h"
 #include "components/prefs/pref_service.h"
 #include "components/undo/bookmark_undo_service.h"
 #include "content/public/browser/browser_thread.h"
 
+#if BUILDFLAG(ANDROID_JAVA_UI)
+#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
+#endif
+
 using bookmarks::BookmarkModel;
 
 // static
@@ -53,6 +59,9 @@ BookmarkModelFactory::BookmarkModelFactory()
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(BookmarkUndoServiceFactory::GetInstance());
   DependsOn(ManagedBookmarkServiceFactory::GetInstance());
+#if BUILDFLAG(ANDROID_JAVA_UI)
+  DependsOn(offline_pages::OfflinePageModelFactory::GetInstance());
+#endif
   DependsOn(StartupTaskRunnerServiceFactory::GetInstance());
 }
 
@@ -70,7 +79,15 @@ KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
                            ->GetBookmarkTaskRunner(),
                        content::BrowserThread::GetTaskRunnerForThread(
                            content::BrowserThread::UI));
+#if BUILDFLAG(ANDROID_JAVA_UI)
+  offline_pages::OfflinePageBookmarkObserver* offline_page_listener =
+      offline_pages::OfflinePageModelFactory::GetForBrowserContext(context)

[Dmitry Titov, 2016/08/17 03:58:36]

But, doesn't it remove the benefit of having OfflinePageBookmarkObserver - that
it can be created w/o creating (and loading) of the OfflinePageModel?

+          ->GetBookmarkObserver();
+  if (offline_page_listener)
+    bookmark_model->AddObserver(offline_page_listener);
+#endif  // BUILDFLAG(ANDROID_JAVA_UI)
   bool register_bookmark_undo_service_as_observer = true;
+
 #if !BUILDFLAG(ANDROID_JAVA_UI)
   register_bookmark_undo_service_as_observer =
       base::CommandLine::ForCurrentProcess()->HasSwitch(