Enable gpu crash tests in content

chrome/test/base/test_launcher_utils.cc

Index: chrome/test/base/test_launcher_utils.cc
diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
index 9e2d2877c1be0d9dc62e491bce4c7e78e2491dd8..c3fbdb2d2b1698853b0c86d678ddeaa828a339d5 100644
--- a/chrome/test/base/test_launcher_utils.cc
+++ b/chrome/test/base/test_launcher_utils.cc
@@ -10,6 +10,7 @@
 #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"
@@ -21,6 +22,8 @@
 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);
 
@@ -38,20 +41,12 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
   // 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.
@@ -96,14 +91,4 @@ bool OverrideUserDataDir(const FilePath& user_data_dir) {
   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