Enable NonValidatingReloadOnNormalReload on variations testing

content/browser/loader/reload_cache_control_browsertest.cc

Index: content/browser/loader/reload_cache_control_browsertest.cc
diff --git a/content/browser/loader/reload_cache_control_browsertest.cc b/content/browser/loader/reload_cache_control_browsertest.cc
index 38586762a6eea3fa9c68ce15ff2ad8a2b795f68e..2748b449e2a69e0d3d6ec0e54bf1aca5a18ba656 100644
--- a/content/browser/loader/reload_cache_control_browsertest.cc
+++ b/content/browser/loader/reload_cache_control_browsertest.cc
@@ -43,6 +43,18 @@ class ReloadCacheControlBrowserTest : public ContentBrowserTest {
   ~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
@@ -83,7 +95,7 @@ class ReloadCacheControlWithAnExperimentBrowserTest
         features::kNonValidatingReloadOnNormalReload.name, std::string());
     base::FeatureList::SetInstance(std::move(feature_list));
 
-    ReloadCacheControlBrowserTest::SetUpOnMainThread();
+    ReloadCacheControlBrowserTest::FinishToSetUpOnMainThread();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ReloadCacheControlWithAnExperimentBrowserTest);