Call util function instead of duplicate the code in gpu_feature_browsertest.cc

chrome/test/gpu/gpu_feature_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/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/gpu/gpu_blacklist.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 namespace {
 
 typedef uint32 GpuResultFlags;
 #define EXPECT_NO_GPU_PROCESS         GpuResultFlags(0)
 // Expect GPU process to be created.
 #define EXPECT_GPU_PROCESS            GpuResultFlags(1<<0)
 // Expect num_contexts_ to be created (onscreen or offscreen).
 #define EXPECT_GPU_CONTEXTS           GpuResultFlags(1<<1)
 // Expect a SwapBuffers to occur (see gles2_cmd_decoder.cc).
 #define EXPECT_GPU_SWAP_BUFFERS       GpuResultFlags(1<<2)
 
 class GpuFeatureTest : public InProcessBrowserTest {
  public:
   GpuFeatureTest()
       : num_contexts_(0),
         num_offscreen_contexts_(0) {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // This enables DOM automation for tab contents.
     EnableDOMAutomation();
 #if !defined(OS_MACOSX)
-    CHECK(!command_line->HasSwitch(switches::kUseGL)) <<
+    CHECK(test_launcher_utils::OverrideGLImplementation(
+        command_line, gfx::kGLImplementationOSMesaName)) <<
         "kUseGL must not be set by test framework code!";
-    command_line->AppendSwitchASCII(switches::kUseGL, "osmesa");
 #endif
   }
 
   void SetupBlacklist(const std::string& json_blacklist) {
     scoped_ptr<Version> os_version(Version::GetVersionFromString("1.0"));
     GpuBlacklist* blacklist = new GpuBlacklist("1.0");
 
     ASSERT_TRUE(blacklist->LoadGpuBlacklist(
         json_blacklist, GpuBlacklist::kAllOs));
     GpuDataManager::GetInstance()->SetGpuBlacklist(blacklist);
@@ skipping 172 matching lines @@
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas));
 
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
   RunTest(url, EXPECT_NO_GPU_PROCESS);
 }
 
 }  // namespace anonymous