Enable gpu crash tests in content

chrome/test/base/test_launcher_utils.cc

 // Copyright (c) 2012 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 "chrome/test/base/test_launcher_utils.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
+#include "content/public/test/test_launcher_utils.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #endif
 
 namespace test_launcher_utils {
 
 void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
+  content::PrepareBrowserCommandLineForTests(command_line);
+
   // Turn off tip loading for tests; see http://crbug.com/17725.
   command_line->AppendSwitch(switches::kDisableWebResources);
 
   // Turn off preconnects because they break the brittle python webserver;
   // see http://crbug.com/60035.
   command_line->AppendSwitch(switches::kDisablePreconnect);
 
   // Turn off built-in asynchronous DNS client.
   command_line->AppendSwitch(switches::kDisableAsyncDns);
 
   // Don't show the first run ui.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // No default browser check, it would create an info-bar (if we are not the
   // default browser) that could conflicts with some tests expectations.
   command_line->AppendSwitch(switches::kNoDefaultBrowserCheck);
 
-  // Enable warning level logging so that we can see when bad stuff happens.
-  command_line->AppendSwitch(switches::kEnableLogging);
-  command_line->AppendSwitchASCII(switches::kLoggingLevel, "1");  // warning
-
   // Disable safebrowsing autoupdate.
   command_line->AppendSwitch(switches::kSbDisableAutoUpdate);
 
   // Don't install default apps.
   command_line->AppendSwitch(switches::kDisableDefaultApps);
 
-  // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist
-  // auto-update.
-  command_line->AppendSwitch(switches::kSkipGpuDataLoading);
-
 #if defined(USE_ASH)
   // Disable window animations under Ash as the animations effect the
   // coordinates returned and result in flake.
   command_line->AppendSwitch(ash::switches::kAshWindowAnimationsDisabled);
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   // Don't use the native password stores on Linux since they may
   // prompt for additional UI during tests and cause test failures or
   // timeouts.  Win, Mac and ChromeOS don't look at the kPasswordStore
@@ skipping 24 matching lines @@
   //
   // Note: we use an environment variable here, because we have to pass the
   // value to the child process. This is the simplest way to do it.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   success = success && env->SetVar("XDG_CACHE_HOME", user_data_dir.value());
 #endif
 
   return success;
 }
 
-bool OverrideGLImplementation(CommandLine* command_line,
-                              const std::string& implementation_name) {
-  if (command_line->HasSwitch(switches::kUseGL))
-    return false;
-
-  command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
-
-  return true;
-}
-
 }  // namespace test_launcher_utils