Revert of Prerender: Hardcode the Silence experiment date

chrome/browser/prerender/prerender_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <utility>
 
@@ skipping 79 matching lines @@
   UnitTestPrerenderManager* test_prerender_manager_;
   FinalStatus expected_final_status_;
 };
 
 int DummyPrerenderContents::g_next_route_id_ = 0;
 
 const gfx::Size kSize(640, 480);
 
 const uint32_t kDefaultRelTypes = PrerenderRelTypePrerender;
 
-const Origin g_prerender_silence_origins[] = {
-    ORIGIN_GWS_PRERENDER,
-    ORIGIN_OMNIBOX,
-    ORIGIN_NONE,
-    ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN,
-    ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
-    ORIGIN_EXTERNAL_REQUEST,
-    ORIGIN_INSTANT,
-    ORIGIN_LINK_REL_NEXT,
-};
-
 base::SimpleTestTickClock* OverridePrerenderManagerTimeTicks(
     PrerenderManager* prerender_manager) {
   auto tick_clock = base::MakeUnique<base::SimpleTestTickClock>();
   base::SimpleTestTickClock* tick_clock_ptr = tick_clock.get();
   prerender_manager->SetTickClockForTesting(std::move(tick_clock));
   return tick_clock_ptr;
 }
 
 bool OverridePrerenderManagerTime(const char* utc_time,
                                   PrerenderManager* prerender_manager) {
@@ skipping 1017 matching lines @@
           url, ORIGIN_OFFLINE, FINAL_STATUS_MANAGER_SHUTDOWN);
   std::unique_ptr<PrerenderHandle> prerender_handle =
       prerender_manager()->AddPrerenderForOffline(url, nullptr, kSize);
   EXPECT_TRUE(prerender_handle);
   EXPECT_TRUE(prerender_handle->IsPrerendering());
   EXPECT_TRUE(prerender_contents->prerendering_has_started());
   EXPECT_EQ(prerender_contents, prerender_handle->contents());
   EXPECT_EQ(ORIGIN_OFFLINE, prerender_handle->contents()->origin());
 }
 
-// Checks that the "PrerenderSilence experiment does not disable forced-cellular
-// prerendering.
-TEST_F(PrerenderTest, PrerenderSilenceAllowsForcedCellular) {
-  // Set the time to 30 seconds before the experiment expires.
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "PrerenderSilence", "ExperimentYes_expires_2016-12-20T00:01:00Z"));
-  ASSERT_TRUE(OverridePrerenderManagerTime("2016-12-20T00:00:30Z",
-                                           prerender_manager()));
-  GURL url("http://www.google.com/");
-  DummyPrerenderContents* prerender_contents =
-      prerender_manager()->CreateNextPrerenderContents(
-          url, ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR,
-          FINAL_STATUS_MANAGER_SHUTDOWN);
-  std::unique_ptr<PrerenderHandle> prerender_handle =
-      prerender_manager()->AddPrerenderOnCellularFromExternalRequest(
-          url, content::Referrer(), nullptr, gfx::Rect(kSize));
-  EXPECT_TRUE(prerender_handle);
-  EXPECT_TRUE(prerender_handle->IsPrerendering());
-  EXPECT_TRUE(prerender_contents->prerendering_has_started());
-  EXPECT_EQ(prerender_contents, prerender_handle->contents());
-  EXPECT_EQ(ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR,
-            prerender_handle->contents()->origin());
-}
-
 // Checks that the "PrerenderSilence" experiment disables prerendering.
 TEST_F(PrerenderTest, PrerenderSilenceDisallowsNonOffline) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "PrerenderSilence", "ExperimentYes_expires_2016-12-20T00:02:00Z"));
   ASSERT_TRUE(OverridePrerenderManagerTime("2016-12-20T00:01:00Z",
                                            prerender_manager()));
-  for (const Origin& origin : g_prerender_silence_origins) {
+  const Origin origins[] = {
+      ORIGIN_GWS_PRERENDER,
+      ORIGIN_OMNIBOX,
+      ORIGIN_NONE,
+      ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN,
+      ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
+      ORIGIN_EXTERNAL_REQUEST,
+      ORIGIN_INSTANT,
+      ORIGIN_LINK_REL_NEXT,
+      ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR,
+  };
+  for (const Origin& origin : origins) {
     EXPECT_TRUE(
         prerender_manager()->IsPrerenderSilenceExperimentForTesting(origin));
   }
 }
-
-// Checks that the "PrerenderSilence" experiment disables prerendering even
-// without the field trial, then expires.
-TEST_F(PrerenderTest, PrerenderSilenceWithoutFieldTrial) {
-  ASSERT_TRUE(OverridePrerenderManagerTime("2016-12-14T08:00:01Z",
-                                           prerender_manager()));
-  for (const Origin& origin : g_prerender_silence_origins) {
-    EXPECT_TRUE(
-        prerender_manager()->IsPrerenderSilenceExperimentForTesting(origin));
-  }
-  ASSERT_TRUE(OverridePrerenderManagerTime("2016-12-15T08:00:00Z",
-                                           prerender_manager()));
-  for (const Origin& origin : g_prerender_silence_origins) {
-    EXPECT_FALSE(
-        prerender_manager()->IsPrerenderSilenceExperimentForTesting(origin));
-  }
-}
 
 // Checks that prerendering is enabled after expiration of the
 // "PrerenderSilence" experiment.
 TEST_F(PrerenderTest, PrerenderSilenceAllowsAfterExpiration) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "PrerenderSilence", "ExperimentYes_expires_2016-12-20T00:02:00Z"));
   ASSERT_TRUE(OverridePrerenderManagerTime("2016-12-20T00:01:60Z",
                                            prerender_manager()));
   GURL url("http://www.google.com/");
   DummyPrerenderContents* prerender_contents =
@@ skipping 595 matching lines @@
   prerender_contents->SetPrerenderMode(PREFETCH_ONLY);
   EXPECT_TRUE(prerender_contents->IsValidHttpMethod("GET"));
   EXPECT_TRUE(prerender_contents->IsValidHttpMethod("HEAD"));
   EXPECT_FALSE(prerender_contents->IsValidHttpMethod("OPTIONS"));
   EXPECT_FALSE(prerender_contents->IsValidHttpMethod("POST"));
   EXPECT_FALSE(prerender_contents->IsValidHttpMethod("TRACE"));
   EXPECT_FALSE(prerender_contents->IsValidHttpMethod("WHATEVER"));
 }
 
 }  // namespace prerender