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

Unified Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 10914247: Enable by default threaded compositing on windows and FCM on mac (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: shorten field trial period Created 8 years, 3 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
Index: chrome/browser/task_manager/task_manager_browsertest.cc
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 01f5634f68caef7b4b8470b55042d0fa86176102..17b57ddc3f01d014f1f455d397fab7c8d5e45df4 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -67,10 +67,12 @@ class TaskManagerBrowserTest : public ExtensionBrowserTest {
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
ExtensionBrowserTest::SetUpCommandLine(command_line);
- // Do not prelaunch the GPU process for these tests because it will show
- // up in task manager but whether it appears before or after the new tab
- // renderer process is not well defined.
+ // Do not prelaunch the GPU process and disable accelerated compositing
+ // for these tests as the GPU process will show up in task manager but
+ // whether it appears before or after the new tab renderer process is not
+ // well defined.
command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch);
+ command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
}
};

Powered by Google App Engine
This is Rietveld 408576698