Revert 227977 "Enable GPU control lists in tests."

trunk/src/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"
@@ skipping 29 matching lines @@
     command_line->AppendSwitchASCII(switches::kEnableLogging, "stderr");
   if (!command_line->HasSwitch(switches::kLoggingLevel))
     command_line->AppendSwitchASCII(switches::kLoggingLevel, "0");  // info
 
   // Disable safebrowsing autoupdate.
   command_line->AppendSwitch(switches::kSbDisableAutoUpdate);
 
   // Don't install default apps.
   command_line->AppendSwitch(switches::kDisableDefaultApps);
 
-#if defined(OS_MACOSX)
   // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist
-  // auto-update on Mac for now (http://crbug.com/304833).
+  // auto-update.
   command_line->AppendSwitch(switches::kSkipGpuDataLoading);
-#endif
 
 #if defined(USE_AURA)
   // Disable window animations under Ash as the animations effect the
   // coordinates returned and result in flake.
   command_line->AppendSwitch(
       views::corewm::switches::kWindowAnimationsDisabled);
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   // Don't use the native password stores on Linux since they may
@@ skipping 27 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;
 }
 
 }  // namespace test_launcher_utils