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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 2537503002: [Prerender] Get the prerender mode from Finch field trial. (Closed)
Patch Set: cleanup Created 4 years 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
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 2816636b2782612e5142796f36e63f05b3cebaa2..3d020ee67ccca6ca7c5847ffa2888418925dcf2b 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -574,10 +574,10 @@ class PrerenderBrowserTest : public test_utils::PrerenderInProcessBrowserTest {
expected_number_of_loads);
}
- void SetUpCommandLine(base::CommandLine* command_line) override {
- PrerenderInProcessBrowserTest::SetUpCommandLine(command_line);
- command_line->AppendSwitchASCII(switches::kPrerenderMode,
- switches::kPrerenderModeSwitchValueEnabled);
+ void SetUpOnMainThread() override {
+ test_utils::PrerenderInProcessBrowserTest::SetUpOnMainThread();
+ prerender::PrerenderManager::SetMode(
+ prerender::PrerenderManager::PRERENDER_MODE_ENABLED);
}
void SetUpInProcessBrowserTestFixture() override {
@@ -2625,7 +2625,6 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,
void SetUp() override { PrerenderBrowserTest::SetUp(); }
void SetUpCommandLine(base::CommandLine* command_line) override {
- PrerenderBrowserTest::SetUpCommandLine(command_line);
ExtensionApiTest::SetUpCommandLine(command_line);
}
@@ -3297,7 +3296,6 @@ class PrerenderBrowserTestWithNaCl : public PrerenderBrowserTest {
~PrerenderBrowserTestWithNaCl() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
- PrerenderBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableNaCl);
}
};
« no previous file with comments | « chrome/browser/extensions/activity_log/activity_log_browsertest.cc ('k') | chrome/browser/prerender/prerender_field_trial.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698