Use a mocked compositor for unit tests

chrome/browser/gpu_browsertest.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
-#include "ui/gfx/gl/gl_implementation.h"
 
 class GPUBrowserTest : public InProcessBrowserTest {
  protected:
   GPUBrowserTest() {
     EnableDOMAutomation();
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
     FilePath test_dir;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     InProcessBrowserTest::SetUpCommandLine(command_line);
 
-    EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation(
-        command_line,
-        gfx::kGLImplementationOSMesaName));
-
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
 
 #if defined(OS_MACOSX)
     // Accelerated compositing does not work with OSMesa. AcceleratedSurface
     // assumes GL contexts are native.
     command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
 #endif
   }
 
   FilePath gpu_test_dir_;
@@ skipping 35 matching lines @@
   ui_test_utils::DOMMessageQueue message_queue;
 
   ui_test_utils::NavigateToURL(
       browser(),
       net::FilePathToFileURL(gpu_test_dir_.AppendASCII("canvas_popup.html")));
 
   std::string result;
   ASSERT_TRUE(message_queue.WaitForMessage(&result));
   EXPECT_EQ("\"SUCCESS\"", result);
 }