diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 07:22:05 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 07:22:05 +0000 |
| commit | 9785b9368fdf43f9f7b0cec377eeeb7a3f3b9129 (patch) | |
| tree | b6a64b7c5d90cd2b145c1ac10bb92856ef4e9626 /content/browser/browser_main_loop.cc | |
| parent | 454134bf6a0002bfca6af40394e274ffea961cb3 (diff) | |
| download | chromium_src-9785b9368fdf43f9f7b0cec377eeeb7a3f3b9129.zip chromium_src-9785b9368fdf43f9f7b0cec377eeeb7a3f3b9129.tar.gz chromium_src-9785b9368fdf43f9f7b0cec377eeeb7a3f3b9129.tar.bz2 | |
Remove the kDisableGpuProcessPrelaunch flag and disable tests.
Tests that depend on this flag actually fail since the UI compositor
creates an OutputSurface which makes the GPU process launch before
the test body gets to run.
Since this flag doesn't really make sense with a UI compositor present,
we should move these tests to not be browser tests. Since they just
pass by early-out right now, remove the early outs and disable them.
R=jbauman@chromium.org, piman@chromium.org
BUG=356876
Review URL: https://codereview.chromium.org/212603006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 89a5281..ab045e4 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -959,7 +959,6 @@ int BrowserMainLoop::BrowserThreadsStarted() { bool established_gpu_channel = false; #if defined(USE_AURA) || defined(OS_ANDROID) established_gpu_channel = - !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) || parsed_command_line_.HasSwitch(switches::kSingleProcess) || parsed_command_line_.HasSwitch(switches::kInProcessGPU); #if defined(USE_AURA) @@ -1032,7 +1031,6 @@ int BrowserMainLoop::BrowserThreadsStarted() { if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) && !established_gpu_channel && always_uses_gpu && - !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) && !parsed_command_line_.HasSwitch(switches::kSingleProcess) && !parsed_command_line_.HasSwitch(switches::kInProcessGPU)) { TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process", |