Update flags used by offline pages and bookmarks

chrome/browser/android/offline_pages/offline_page_utils.cc

Index: chrome/browser/android/offline_pages/offline_page_utils.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_utils.cc b/chrome/browser/android/offline_pages/offline_page_utils.cc
index a2595778044a5efa3df262f05d5e16dae2f5e8b4..ee5c94059a8a25de508eaf920631e93362490269 100644
--- a/chrome/browser/android/offline_pages/offline_page_utils.cc
+++ b/chrome/browser/android/offline_pages/offline_page_utils.cc
@@ -24,7 +24,7 @@ const offline_pages::OfflinePageItem* GetOfflinePageForOnlineURL(
     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 =
@@ -42,7 +42,7 @@ const offline_pages::OfflinePageItem* GetOfflinePageForOfflineURL(
     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
@@ -135,7 +135,7 @@ 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 =