Rename flags for Origin Trials framework

third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp

Index: third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
index 7c2e011fa6cfa35b1686f119ae2262772469f596..341a3da3ac49176c2a5b5e44d9ea888758a05c88 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
@@ -77,18 +77,15 @@ private:
 class OriginTrialContextTest : public ::testing::Test {
 protected:
     OriginTrialContextTest()
-        : m_frameworkWasEnabled(RuntimeEnabledFeatures::experimentalFrameworkEnabled())

[iclelland, 2016/05/11 16:23:44]

This is more than a rename -- is it also unnecessary now to track the state of
the flag during test runs?

[chasej, 2016/05/11 19:05:39]

It might be premature to remove this now, but the flag is set to stable. Also, I
can't find it now, but I seem to recall someone implementing support to
automatically reset flags for tests.

Anyway, as the trybots are green, I thought it made sense to remove the manual
tracking, vs rename. I can certainly defer to a later cleanup CL if desired.

[iclelland, 2016/05/11 19:14:50]

I don't think it's premature -- I'd quickly LGTM both CLs if it were split up.
As it is, this is a strange CL to find this change in. It looks like it could
have been an accident. You could update the commit message to include both
changes, but I think it's cleaner to just split it. (Commits are pretty cheap)

[chasej, 2016/05/11 19:33:13]

Changed to rename, instead of cleanup.

-        , m_executionContext(new NullExecutionContext())
+        : m_executionContext(new NullExecutionContext())
         , m_tokenValidator(adoptPtr(new MockTokenValidator()))
         , m_originTrialContext(new OriginTrialContext(m_executionContext.get()))
         , m_histogramTester(new HistogramTester())
     {
-        RuntimeEnabledFeatures::setExperimentalFrameworkEnabled(true);
     }
 
     ~OriginTrialContextTest()
     {
-        RuntimeEnabledFeatures::setExperimentalFrameworkEnabled(m_frameworkWasEnabled);
     }
 
     MockTokenValidator* tokenValidator() { return m_tokenValidator.get(); }
@@ -137,7 +134,6 @@ protected:
     }
 
 private:
-    const bool m_frameworkWasEnabled;
     Persistent<NullExecutionContext> m_executionContext;
     OwnPtr<MockTokenValidator> m_tokenValidator;
     Persistent<OriginTrialContext> m_originTrialContext;