Revert 227977 "Enable GPU control lists in tests."

trunk/src/content/public/test/browser_test_base.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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 135 matching lines @@
 }
 
 void BrowserTestBase::SetUp() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
   command_line->AppendSwitch(switches::kDomAutomationController);
 
-  // It is sometimes useful when looking at browser test failures to know which
-  // GPU blacklisting decisions were made.
-  command_line->AppendSwitch(switches::kLogGpuControlListDecisions);
+  command_line->AppendSwitch(switches::kSkipGpuDataLoading);
 
 #if defined(USE_AURA)
   // Use test contexts for browser tests unless they override and force us to
   // use a real context.
   if (allow_test_contexts_)
     command_line->AppendSwitch(switches::kTestCompositor);
 #endif
 
   // When using real GL contexts, we usually use OSMesa as this works on all
   // bots. The command line can override this behaviour to use a real GPU.
@@ skipping 93 matching lines @@
       RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
   CHECK(renderer_loop);
 
   renderer_loop->PostTask(
       FROM_HERE,
       base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
   runner->Run();
 }
 
 }  // namespace content