Update flags used by offline pages and bookmarks

chrome/browser/bookmarks/bookmark_model_factory.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/browser/bookmarks/bookmark_model_factory.h"
 
 #include "base/command_line.h"
 #include "base/deferred_sequenced_task_runner.h"
 #include "base/memory/singleton.h"
 #include "base/values.h"
@@ skipping 41 matching lines @@
 }
 
 BookmarkModelFactory::BookmarkModelFactory()
     : BrowserContextKeyedServiceFactory(
         "BookmarkModel",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(BookmarkUndoServiceFactory::GetInstance());
   DependsOn(ManagedBookmarkServiceFactory::GetInstance());
   DependsOn(StartupTaskRunnerServiceFactory::GetInstance());
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  if (offline_pages::IsOfflinePagesEnabled())
+  if (offline_pages::IsOfflineBookmarksEnabled())

[fgorski, 2016/04/18 17:09:37]

Same idea as above. (And applies below)

[jianli, 2016/04/18 21:17:00]

Done.

     DependsOn(offline_pages::OfflinePageModelFactory::GetInstance());
 #endif
 }
 
 BookmarkModelFactory::~BookmarkModelFactory() {
 }
 
 KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
   BookmarkModel* bookmark_model =
       new BookmarkModel(make_scoped_ptr(new ChromeBookmarkClient(
           profile, ManagedBookmarkServiceFactory::GetForProfile(profile))));
   bookmark_model->Load(profile->GetPrefs(),
                        profile->GetPath(),
                        StartupTaskRunnerServiceFactory::GetForProfile(profile)
                            ->GetBookmarkTaskRunner(),
                        content::BrowserThread::GetMessageLoopProxyForThread(
                            content::BrowserThread::UI));
   bool register_bookmark_undo_service_as_observer = true;
 #if !BUILDFLAG(ANDROID_JAVA_UI)
   register_bookmark_undo_service_as_observer =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBookmarkUndo);
 #endif  // !BUILDFLAG(ANDROID_JAVA_UI)
   if (register_bookmark_undo_service_as_observer)
     BookmarkUndoServiceFactory::GetForProfile(profile)->Start(bookmark_model);
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  if (offline_pages::IsOfflinePagesEnabled()) {
+  if (offline_pages::IsOfflineBookmarksEnabled()) {
     // This observer will delete itself when BookmarkModelDeleted is called.
     bookmark_model->AddObserver(new offline_pages::OfflinePageBookmarkBridge(
         offline_pages::OfflinePageModelFactory::GetForBrowserContext(profile),
         bookmark_model));
   }
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 
   return bookmark_model;
 }
 
 void BookmarkModelFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   bookmarks::RegisterProfilePrefs(registry);
 }
 
 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }