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

content/browser/gpu/gpu_ipc_browsertests.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/run_loop.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 63 matching lines @@
 #include "content/common/gpu/client/gpu_context_tests.h"
 
 namespace content {
 
 class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest {
  public:
   void SetUpOnMainThread() override {
     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();
   }
 
  protected:
   BrowserGpuChannelHostFactory* GetFactory() {
     return BrowserGpuChannelHostFactory::instance();
   }
 
@@ skipping 23 matching lines @@
             GetGpuChannel(),
             blink::WebGraphicsContext3D::Attributes(),
             lose_context_when_out_of_memory,
             GURL(),
             WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
             NULL));
   }
 };
 
 // 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);
 }
 
 // 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());
   GetFactory()->Terminate();
 
   // The callback should still trigger.
   run_loop.Run();
 }
 
 #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);
 
   // Expect established callback immediately.
   bool event = false;
   GetFactory()->EstablishGpuChannel(
       kInitCause,
       base::Bind(&BrowserGpuChannelHostFactoryTest::Signal, &event));
   EXPECT_TRUE(event);
   EXPECT_EQ(gpu_channel.get(), GetGpuChannel());
 }
 #endif
 
 // Fails since UI Compositor establishes a GpuChannel.
 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
-                       DISABLED_CrashAndRecover) {
+                       CrashAndRecover) {
   DCHECK(!IsChannelEstablished());
   EstablishAndWait();
   scoped_refptr<GpuChannelHost> host = GetGpuChannel();
 
   scoped_refptr<ContextProviderCommandBuffer> provider =
       ContextProviderCommandBuffer::Create(CreateContext(),
                                            "BrowserGpuChannelHostFactoryTest");
   base::RunLoop run_loop;
   int counter = 0;
   provider->SetLostContextCallback(
       base::Bind(&BrowserGpuChannelHostFactoryTest::OnContextLost,
                  base::Unretained(this), run_loop.QuitClosure(), &counter));
   EXPECT_TRUE(provider->BindToCurrentThread());
   GpuProcessHostUIShim* shim =
       GpuProcessHostUIShim::FromID(GetFactory()->GpuProcessHostId());
   EXPECT_TRUE(shim != NULL);
   shim->SimulateCrash();
   run_loop.Run();
 
   EXPECT_EQ(1, counter);
   EXPECT_FALSE(IsChannelEstablished());
   EstablishAndWait();
   EXPECT_TRUE(IsChannelEstablished());
 }
 
 }  // namespace content