Update flags used by offline pages and bookmarks

components/offline_pages/offline_page_model_unittest.cc

Index: components/offline_pages/offline_page_model_unittest.cc
diff --git a/components/offline_pages/offline_page_model_unittest.cc b/components/offline_pages/offline_page_model_unittest.cc
index 50f65b2dae9da81e024a72e52584b8cb16239af2..7d2d5ecc5b8145ebc6496e777d3b19ee6592397b 100644
--- a/components/offline_pages/offline_page_model_unittest.cc
+++ b/components/offline_pages/offline_page_model_unittest.cc
@@ -30,7 +30,6 @@
 #include "components/offline_pages/offline_page_bookmark_bridge.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
-#include "components/offline_pages/offline_page_switches.h"
 #include "components/offline_pages/offline_page_test_archiver.h"
 #include "components/offline_pages/offline_page_test_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -1118,35 +1117,62 @@ TEST_F(OfflinePageModelTest, SaveRetrieveMultipleClientIds) {
   EXPECT_TRUE(id_set.find(offline2) != id_set.end());
 }
 
-TEST(CommandLineFlagsTest, OffliningRecentPages) {
-  // TODO(dimich): once offline pages are enabled by default, remove this.
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableOfflinePages);
+TEST(CommandLineFlagsTest, OfflineBookmarks) {
   // Disabled by default.
-  EXPECT_FALSE(offline_pages::IsOffliningRecentPagesEnabled());
+  EXPECT_FALSE(offline_pages::IsOfflineBookmarksEnabled());
 
   // Check if feature is correctly enabled by command-line flag.
   base::FeatureList::ClearInstanceForTesting();
   scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
   feature_list->InitializeFromCommandLine(
-      offline_pages::kOffliningRecentPagesFeature.name, "");
+      offline_pages::kOfflineBookmarksFeature.name, "");
   base::FeatureList::SetInstance(std::move(feature_list));
-  EXPECT_TRUE(offline_pages::IsOffliningRecentPagesEnabled());
+  EXPECT_TRUE(offline_pages::IsOfflineBookmarksEnabled());
 }
 
-TEST(CommandLineFlagsTest, OfflinePagesBackgroundLoading) {
+TEST(CommandLineFlagsTest, OffliningRecentPages) {
+  // Enable offline bookmarks feature first.
   // TODO(dimich): once offline pages are enabled by default, remove this.
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableOfflinePages);
-  // Disabled by default.
-  EXPECT_FALSE(offline_pages::IsOfflinePagesBackgroundLoadingEnabled());
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      offline_pages::kOfflineBookmarksFeature.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+
+  // This feature is still disabled by default.
+  EXPECT_FALSE(offline_pages::IsOffliningRecentPagesEnabled());
 
   // Check if feature is correctly enabled by command-line flag.
   base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list2(new base::FeatureList);
+  feature_list2->InitializeFromCommandLine(
+      std::string(offline_pages::kOfflineBookmarksFeature.name) + "," +
+          offline_pages::kOffliningRecentPagesFeature.name,
+      "");
+  base::FeatureList::SetInstance(std::move(feature_list2));
+  EXPECT_TRUE(offline_pages::IsOffliningRecentPagesEnabled());
+}
+
+TEST(CommandLineFlagsTest, OfflinePagesBackgroundLoading) {
+  // Enable offline bookmarks feature first.
+  // TODO(dimich): once offline pages are enabled by default, remove this.
+  base::FeatureList::ClearInstanceForTesting();
   scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
   feature_list->InitializeFromCommandLine(
-      offline_pages::kOfflinePagesBackgroundLoadingFeature.name, "");
+      offline_pages::kOfflineBookmarksFeature.name, "");
   base::FeatureList::SetInstance(std::move(feature_list));
+
+  // This feature is still disabled by default.
+  EXPECT_FALSE(offline_pages::IsOfflinePagesBackgroundLoadingEnabled());
+
+  // Check if feature is correctly enabled by command-line flag.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list2(new base::FeatureList);
+  feature_list2->InitializeFromCommandLine(
+      std::string(offline_pages::kOfflineBookmarksFeature.name) + "," +
+          offline_pages::kOfflinePagesBackgroundLoadingFeature.name,
+      "");
+  base::FeatureList::SetInstance(std::move(feature_list2));
   EXPECT_TRUE(offline_pages::IsOfflinePagesBackgroundLoadingEnabled());
 }