aura: Clean up compositor initialization/destruction.

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/compositor/compositor_switches.h"
 
 #if defined(OS_POSIX)
 #include "base/process/process_handle.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/power_monitor/power_monitor.h"
 #endif
 
@@ skipping 31 matching lines @@
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_task);
 }
 
 }  // namespace
 
 extern int BrowserMain(const MainFunctionParams&);
 
 BrowserTestBase::BrowserTestBase()
     : embedded_test_server_(
         new net::test_server::EmbeddedTestServer(
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))) {
+            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))),
+      allow_test_contexts_(true) {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
   base::PowerMonitor::AllocateSystemIOPorts();
 #endif
 
 #if defined(OS_POSIX)
   handle_sigterm_ = true;
 #endif
 }
 
@@ skipping 13 matching lines @@
 
   command_line->AppendSwitch(switches::kDomAutomationController);
 
   command_line->AppendSwitch(switches::kSkipGpuDataLoading);
 
   MainFunctionParams params(*command_line);
   params.ui_task =
       new base::Closure(
           base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
 
+#if defined(USE_AURA)
+  // Copy what UITestBase::SetLaunchSwitches() does, and also what
+  // ChromeTestSuite does if the process had went into the test path. Otherwise
+  // tests will fail on bots.
+  if (allow_test_contexts_)
+    command_line->AppendSwitch(switches::kTestCompositor);
+#endif
+
   SetUpInProcessBrowserTestFixture();
 #if defined(OS_ANDROID)
   BrowserMainRunner::Create()->Initialize(params);
   // We are done running the test by now. During teardown we
   // need to be able to perform IO.
   base::ThreadRestrictions::SetIOAllowed(true);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
                  true));
@@ skipping 35 matching lines @@
       RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
   CHECK(renderer_loop);
 
   renderer_loop->PostTask(
       FROM_HERE,
       base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
   runner->Run();
 }
 
 }  // namespace content