| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
|
| index e03a9795d48dea43c43486635a839d34c442d3de..5556369f6a904e8790efd804361ee5f3f276347b 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -3278,10 +3278,6 @@ class SSLNetworkTimeBrowserTest : public SSLUITest {
|
|
|
| void SetUpCommandLine(base::CommandLine* command_line) override {
|
| command_line->AppendSwitchASCII(
|
| - switches::kEnableFeatures,
|
| - std::string(network_time::kNetworkTimeServiceQuerying.name) +
|
| - "<SSLNetworkTimeBrowserTestFieldTrial");
|
| - command_line->AppendSwitchASCII(
|
| switches::kForceFieldTrials,
|
| "SSLNetworkTimeBrowserTestFieldTrial/Enabled/");
|
| command_line->AppendSwitchASCII(
|
| @@ -3292,6 +3288,10 @@ class SSLNetworkTimeBrowserTest : public SSLUITest {
|
|
|
| void SetUpOnMainThread() override {
|
| SSLUITest::SetUpOnMainThread();
|
| + scoped_feature_list_.InitFromCommandLine(
|
| + std::string(network_time::kNetworkTimeServiceQuerying.name) +
|
| + "<SSLNetworkTimeBrowserTestFieldTrial",
|
| + std::string());
|
| SetUpNetworkTimeServer();
|
| }
|
|
|
| @@ -3330,6 +3330,7 @@ class SSLNetworkTimeBrowserTest : public SSLUITest {
|
|
|
| private:
|
| DelayedNetworkTimeInterceptor* interceptor_;
|
| + base::test::ScopedFeatureList scoped_feature_list_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SSLNetworkTimeBrowserTest);
|
| };
|
|
|