Revert of Moving previews code from components/ to chrome/

components/previews/core/previews_opt_out_store_sql_unittest.cc

Index: components/previews/core/previews_opt_out_store_sql_unittest.cc
diff --git a/components/previews/core/previews_opt_out_store_sql_unittest.cc b/components/previews/core/previews_opt_out_store_sql_unittest.cc
index 2057eed61b7db61e43c47322065bc8c484e913ba..9974885b1d8a935459ed2d0cf6ab9237b842a886 100644
--- a/components/previews/core/previews_opt_out_store_sql_unittest.cc
+++ b/components/previews/core/previews_opt_out_store_sql_unittest.cc
@@ -64,17 +64,16 @@
   }
 
   // Creates a store that operates on one thread.
-  void Create(std::unique_ptr<PreviewsTypeList> enabled_previews) {
+  void Create() {
     store_ = base::MakeUnique<PreviewsOptOutStoreSQL>(
         base::ThreadTaskRunnerHandle::Get(),
         base::ThreadTaskRunnerHandle::Get(),
-        temp_dir_.GetPath().Append(kOptOutFilename),
-        std::move(enabled_previews));
+        temp_dir_.GetPath().Append(kOptOutFilename));
   }
 
   // Sets up initialization of |store_|.
-  void CreateAndLoad(std::unique_ptr<PreviewsTypeList> enabled_previews) {
-    Create(std::move(enabled_previews));
+  void CreateAndLoad() {
+    Create();
     Load();
   }
 
@@ -115,9 +114,7 @@
 TEST_F(PreviewsOptOutStoreSQLTest, TestErrorRecovery) {
   // Creates the database and corrupt to test the recovery method.
   std::string test_host = "host.com";
-  std::unique_ptr<PreviewsTypeList> enabled_previews(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   store_->AddPreviewNavigation(true, test_host, PreviewsType::OFFLINE,
                                base::Time::Now());
   base::RunLoop().RunUntilIdle();
@@ -128,9 +125,7 @@
       temp_dir_.GetPath().Append(kOptOutFilename)));
   base::RunLoop().RunUntilIdle();
 
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   // The data should be recovered.
   EXPECT_EQ(1U, black_list_map_->size());
   auto iter = black_list_map_->find(test_host);
@@ -142,9 +137,7 @@
 TEST_F(PreviewsOptOutStoreSQLTest, TestPersistance) {
   // Tests if data is stored as expected in the SQLite database.
   std::string test_host = "host.com";
-  std::unique_ptr<PreviewsTypeList> enabled_previews(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   histogram_tester_.ExpectUniqueSample("Previews.OptOut.DBRowCount", 0, 1);
   base::Time now = base::Time::Now();
   store_->AddPreviewNavigation(true, test_host, PreviewsType::OFFLINE, now);
@@ -155,9 +148,7 @@
   DestroyStore();
 
   // Reload and test for persistence
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   EXPECT_EQ(1U, black_list_map_->size());
   auto iter = black_list_map_->find(test_host);
 
@@ -181,9 +172,7 @@
   std::string row_limit_string = base::SizeTToString(row_limit);
   command_line->AppendSwitchASCII("previews-max-opt-out-rows",
                                   row_limit_string);
-  std::unique_ptr<PreviewsTypeList> enabled_previews(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   histogram_tester_.ExpectUniqueSample("Previews.OptOut.DBRowCount", 0, 1);
   base::SimpleTestClock clock;
 
@@ -205,9 +194,7 @@
   DestroyStore();
 
   // Reload and test for persistence
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   histogram_tester_.ExpectBucketCount("Previews.OptOut.DBRowCount",
                                       static_cast<int>(row_limit) + 1, 1);
   // The delete happens after the load, so it is possible to load more than
@@ -217,9 +204,7 @@
             host_indifferent_item_->OptOutRecordsSizeForTesting());
 
   DestroyStore();
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   histogram_tester_.ExpectBucketCount("Previews.OptOut.DBRowCount",
                                       static_cast<int>(row_limit), 1);
 
@@ -247,9 +232,7 @@
   std::string row_limit_string = base::SizeTToString(row_limit);
   command_line->AppendSwitchASCII("previews-max-opt-out-rows-per-host",
                                   row_limit_string);
-  std::unique_ptr<PreviewsTypeList> enabled_previews(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   histogram_tester_.ExpectUniqueSample("Previews.OptOut.DBRowCount", 0, 1);
   base::SimpleTestClock clock;
 
@@ -271,9 +254,7 @@
   DestroyStore();
 
   // Reload and test for persistence.
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   histogram_tester_.ExpectBucketCount("Previews.OptOut.DBRowCount",
                                       static_cast<int>(row_limit), 1);
 
@@ -296,10 +277,13 @@
   // Tests if data is cleared for previews type when it is disabled.
   // Enable offline previews and add black list entry for it.
   std::map<std::string, std::string> params;
-  std::string test_host = "host.com";
-  std::unique_ptr<PreviewsTypeList> enabled_previews(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  params["show_offline_pages"] = "true";
+  EXPECT_TRUE(
+      base::AssociateFieldTrialParams("ClientSidePreviews", "Enabled", params));
+  EXPECT_TRUE(
+      base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
+  std::string test_host = "host.com";
+  CreateAndLoad();
   histogram_tester_.ExpectUniqueSample("Previews.OptOut.DBRowCount", 0, 1);
   base::Time now = base::Time::Now();
   store_->AddPreviewNavigation(true, test_host, PreviewsType::OFFLINE, now);
@@ -308,29 +292,41 @@
   // Force data write to database then reload it and verify black list entry
   // is present.
   DestroyStore();
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 0});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   auto iter = black_list_map_->find(test_host);
   EXPECT_NE(black_list_map_->end(), iter);
   EXPECT_EQ(1U, iter->second->OptOutRecordsSizeForTesting());
 
-  DestroyStore();
-  enabled_previews.reset(new PreviewsTypeList);
-  CreateAndLoad(std::move(enabled_previews));
+  // Now reload with offline pages previews disabled and verify black list
+  // entry dropped.
+  ResetFieldTrials();
+  params["show_offline_pages"] = "false";
+  EXPECT_TRUE(
+      base::AssociateFieldTrialParams("ClientSidePreviews", "Enabled", params));
+  EXPECT_TRUE(
+      base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
+  DestroyStore();
+  CreateAndLoad();
   iter = black_list_map_->find(test_host);
   EXPECT_EQ(black_list_map_->end(), iter);
 
+  // Clean up field trials set in this test.
+  ResetFieldTrials();
 }
 
 TEST_F(PreviewsOptOutStoreSQLTest,
        TestPreviewsVersionUpdateClearsBlacklistEntry) {
   // Tests if data is cleared for new version of previews type.
   // Enable offline previews and add black list entry for it.
-  std::string test_host = "host.com";
-  std::unique_ptr<PreviewsTypeList> enabled_previews(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 1});
-  CreateAndLoad(std::move(enabled_previews));
+  std::map<std::string, std::string> params;
+  params["show_offline_pages"] = "true";
+  params["version"] = "1";
+  EXPECT_TRUE(
+      base::AssociateFieldTrialParams("ClientSidePreviews", "Enabled", params));
+  EXPECT_TRUE(
+      base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
+  std::string test_host = "host.com";
+  CreateAndLoad();
   histogram_tester_.ExpectUniqueSample("Previews.OptOut.DBRowCount", 0, 1);
   base::Time now = base::Time::Now();
   store_->AddPreviewNavigation(true, test_host, PreviewsType::OFFLINE, now);
@@ -339,19 +335,26 @@
   // Force data write to database then reload it and verify black list entry
   // is present.
   DestroyStore();
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 1});
-  CreateAndLoad(std::move(enabled_previews));
+  CreateAndLoad();
   auto iter = black_list_map_->find(test_host);
   EXPECT_NE(black_list_map_->end(), iter);
   EXPECT_EQ(1U, iter->second->OptOutRecordsSizeForTesting());
 
-  DestroyStore();
-  enabled_previews.reset(new PreviewsTypeList);
-  enabled_previews->push_back({PreviewsType::OFFLINE, 2});
-  CreateAndLoad(std::move(enabled_previews));
+  // Now reload with incremented previews version and verify black list
+  // entry dropped.
+  ResetFieldTrials();
+  params["version"] = "2";
+  EXPECT_TRUE(
+      base::AssociateFieldTrialParams("ClientSidePreviews", "Enabled", params));
+  EXPECT_TRUE(
+      base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
+  DestroyStore();
+  CreateAndLoad();
   iter = black_list_map_->find(test_host);
   EXPECT_EQ(black_list_map_->end(), iter);
+
+  // Clean up field trials set in this test.
+  ResetFieldTrials();
 }
 
 }  // namespace net