Update flags used by offline pages and bookmarks

chrome/browser/android/offline_pages/offline_page_utils.cc

 // Copyright 2015 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/android/offline_pages/offline_page_utils.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "content/public/browser/browser_context.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
 namespace {
 
 // Returns an offline page originated from the |online_url|.
 const offline_pages::OfflinePageItem* GetOfflinePageForOnlineURL(
     content::BrowserContext* browser_context,
     const GURL& online_url) {
   DCHECK(browser_context);
 
-  if (!offline_pages::IsOfflinePagesEnabled())
+  if (!offline_pages::IsOfflineBookmarksEnabled())

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

This is a bit tricky. I don't think we should be checking for bookmarks being
enabled here, as these checks will be growing with lastN and others offline
things added.

How about we still have:
bool offline_pages::IsOfflinePagesEnbaled() {
  return IsOfflineBookmarksEnabled()
      || IsOfflineOtherFeatureEnabled() 
      || IsOfflineYetAnotherFeatureEnabled();
}

// Names of features are of course made up, but you know what I mean. Either one
of these features should make this code work regardless of the any other parts.

And this code will not have to change

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

Done.

     return nullptr;
 
   offline_pages::OfflinePageModel* offline_page_model =
       offline_pages::OfflinePageModelFactory::GetForBrowserContext(
           browser_context);
   if (!offline_page_model)
     return nullptr;
 
   return offline_page_model->GetPageByOnlineURL(online_url);
 }
 
 // Returns an offline page that is stored as the |offline_url|.
 const offline_pages::OfflinePageItem* GetOfflinePageForOfflineURL(
     content::BrowserContext* browser_context,
     const GURL& offline_url) {
   DCHECK(browser_context);
 
-  if (!offline_pages::IsOfflinePagesEnabled())
+  if (!offline_pages::IsOfflineBookmarksEnabled())
     return nullptr;
 
   // Note that we first check if the url likely points to an offline page
   // before calling GetPageByOfflineURL in order to avoid unnecessary lookup
   // cost.
   if (!OfflinePageUtils::MightBeOfflineURL(offline_url))
     return nullptr;
 
   offline_pages::OfflinePageModel* offline_page_model =
       offline_pages::OfflinePageModelFactory::GetForBrowserContext(
@@ skipping 72 matching lines @@
   const offline_pages::OfflinePageItem* offline_page =
       GetOfflinePageForOnlineURL(browser_context, online_url);
   return offline_page && !offline_page->file_path.empty();
 }
 
 // static
 bool OfflinePageUtils::HasOfflinePages(
     content::BrowserContext* browser_context) {
   DCHECK(browser_context);
 
-  if (!offline_pages::IsOfflinePagesEnabled())
+  if (!offline_pages::IsOfflineBookmarksEnabled())
     return false;
 
   offline_pages::OfflinePageModel* offline_page_model =
       offline_pages::OfflinePageModelFactory::GetForBrowserContext(
           browser_context);
   return offline_page_model->HasOfflinePages();
 }
 
 }  // namespace offline_pages