Add switch (for cast_shell) to defer creation of GPU process.

content/browser/gpu/gpu_ipc_browsertests.cc

Index: content/browser/gpu/gpu_ipc_browsertests.cc
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc
index 817d73229b481d8fc211a1d5c0a4dce1482b768e..2e82d0af96955ea862f12ed0ba510260e6875d4f 100644
--- a/content/browser/gpu/gpu_ipc_browsertests.cc
+++ b/content/browser/gpu/gpu_ipc_browsertests.cc
@@ -81,16 +81,17 @@ class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest {
     if (!BrowserGpuChannelHostFactory::CanUseForTesting())
       return;
 
-    // Start all tests without a gpu channel so that the tests exercise a
-    // consistent codepath.
-    if (!BrowserGpuChannelHostFactory::instance())
-      BrowserGpuChannelHostFactory::Initialize(false);
-
     CHECK(GetFactory());

[no sievers, 2015/03/26 22:05:29]

Doesn't this fail? Don't you still have to call
BrowserGpuChannelHostFactory::Initialize(false)?

[halliwell, 2015/03/26 22:16:52]

Good point.  The test was passing for me, but that may be platform-dependent?
(BrowserGpuChannelHostFactory::Initialize was still called for me, from
BrowserMainLoop::BrowserThreadsStarted, but there are various platform ifdefs).

[no sievers, 2015/03/26 23:16:19]

AURA || MAC || ANDROID might cover everything.
But feel free to go with what the bots say :)

I think either way this is fine because each test calls
DCHECK(!IsChannelEstablished()) which makes sure that your cmdline works.

 
     ContentBrowserTest::SetUpOnMainThread();
   }
 
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    // Start all tests without a gpu channel so that the tests exercise a
+    // consistent codepath.
+    command_line->AppendSwitchASCII(switches::kDisableGpuEarlyInit, "");
+  }
+
   void OnContextLost(const base::Closure callback, int* counter) {
     (*counter)++;
     callback.Run();
@@ -134,7 +135,7 @@ class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest {
 };
 
 // Fails since UI Compositor establishes a GpuChannel.
-IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, DISABLED_Basic) {
+IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, Basic) {
   DCHECK(!IsChannelEstablished());
   EstablishAndWait();
   EXPECT_TRUE(GetGpuChannel() != NULL);
@@ -142,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, DISABLED_Basic) {
 
 // Fails since UI Compositor establishes a GpuChannel.
 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
-                       DISABLED_EstablishAndTerminate) {
+                       EstablishAndTerminate) {
   DCHECK(!IsChannelEstablished());
   base::RunLoop run_loop;
   GetFactory()->EstablishGpuChannel(kInitCause, run_loop.QuitClosure());
@@ -155,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
 #if !defined(OS_ANDROID)
 // Fails since UI Compositor establishes a GpuChannel.
 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
-                       DISABLED_AlreadyEstablished) {
+                       AlreadyEstablished) {
   DCHECK(!IsChannelEstablished());
   scoped_refptr<GpuChannelHost> gpu_channel =
       GetFactory()->EstablishGpuChannelSync(kInitCause);
@@ -172,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
 
 // Fails since UI Compositor establishes a GpuChannel.
 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
-                       DISABLED_CrashAndRecover) {
+                       CrashAndRecover) {
   DCHECK(!IsChannelEstablished());
   EstablishAndWait();
   scoped_refptr<GpuChannelHost> host = GetGpuChannel();