Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 2929713002: [Cleanup] Transition NetworkTime browser tests to use a ScopedFeatureList. (Closed)
Patch Set: Update SSLNetworkTimeBrowserTest as well Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698