Enable NonValidatingReloadOnNormalReload on variations testing

content/browser/loader/reload_cache_control_browsertest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
@@ skipping 25 matching lines @@
   std::string relative_url;
   std::string cache_control;
 };
 
 class ReloadCacheControlBrowserTest : public ContentBrowserTest {
  protected:
   ReloadCacheControlBrowserTest() = default;
   ~ReloadCacheControlBrowserTest() override = default;
 
   void SetUpOnMainThread() override {
+    // TODO(toyoshim): Tests in this file depend on current reload behavior,
+    // and should be modified when we enable the new reload behavior.
+    base::FeatureList::ClearInstanceForTesting();
+    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
+    feature_list->InitializeFromCommandLine(
+        std::string(), features::kNonValidatingReloadOnNormalReload.name);
+    base::FeatureList::SetInstance(std::move(feature_list));
+
+    FinishToSetUpOnMainThread();
+  }
+
+  void FinishToSetUpOnMainThread() {

[kinuko, 2016/07/08 04:33:50]

I think it'd be better to give a clearer/straightforward name to this one?  E.g.
SetUpTestServerOnMainThread()

[Takashi Toyoshima, 2016/07/08 06:34:27]

Done.

     // ContentBrowserTest creates embedded_test_server instance with
     // a registered HandleFileRequest for "content/test/data".
     // Because the handler is registered as the first handler, MonitorHandler
     // is needed to capture all requests.
     embedded_test_server()->RegisterRequestMonitor(base::Bind(
         &ReloadCacheControlBrowserTest::MonitorRequestHandler, this));
 
     ASSERT_TRUE(embedded_test_server()->Start());
   }
 
@@ skipping 20 matching lines @@
   ReloadCacheControlWithAnExperimentBrowserTest() = default;
   ~ReloadCacheControlWithAnExperimentBrowserTest() override = default;
 
   void SetUpOnMainThread() override {
     base::FeatureList::ClearInstanceForTesting();
     std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
     feature_list->InitializeFromCommandLine(
         features::kNonValidatingReloadOnNormalReload.name, std::string());
     base::FeatureList::SetInstance(std::move(feature_list));
 
-    ReloadCacheControlBrowserTest::SetUpOnMainThread();
+    ReloadCacheControlBrowserTest::FinishToSetUpOnMainThread();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ReloadCacheControlWithAnExperimentBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ReloadCacheControlBrowserTest, NormalReload) {
   GURL url(embedded_test_server()->GetURL(kReloadTestPath));
 
   EXPECT_TRUE(NavigateToURL(shell(), url));
   ReloadBlockUntilNavigationsComplete(shell(), 1);
@@ skipping 45 matching lines @@
   EXPECT_EQ(kMaxAgeCacheControl, request_log_[2].cache_control);
   EXPECT_EQ(kReloadImagePath, request_log_[3].relative_url);
   EXPECT_EQ(kNoCacheControl, request_log_[3].cache_control);
 }
 
 // TODO(toyoshim): Add another set of reload tests with DevTools open.
 
 }  // namespace
 
 }  // namespace content