Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/content/browser/gpu/gpu_info_browsertest.cc

 // Copyright (c) 2013 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/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/content_switches.h"
 #include "content/test/content_browser_test.h"
+#include "ui/compositor/compositor_setup.h"
 
 namespace content {
 
 namespace {
 
 class TestObserver : public GpuDataManagerObserver {
  public:
   explicit TestObserver(base::MessageLoop* message_loop)
       : message_loop_(message_loop) {
   }
@@ skipping 42 matching lines @@
 };
 
 }  // namespace anonymous
 
 class GpuInfoBrowserTest : public ContentBrowserTest {
  public:
   GpuInfoBrowserTest()
       : message_loop_(base::MessageLoop::TYPE_UI) {
   }
 
-  virtual void SetUp() {
-    // We expect real pixel output for these tests.
-    UseRealGLContexts();
-
-    ContentBrowserTest::SetUp();
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    ContentBrowserTest::SetUpInProcessBrowserTestFixture();
+    ui::DisableTestCompositor();
   }
 
   base::MessageLoop* GetMessageLoop() { return &message_loop_; }
 
  private:
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuInfoBrowserTest);
 };
 
@@ skipping 10 matching lines @@
 #endif
   TestObserver observer(GetMessageLoop());
   GpuDataManagerImpl::GetInstance()->AddObserver(&observer);
   GpuDataManagerImpl::GetInstance()->RequestCompleteGpuInfoIfNeeded();
 
   GetMessageLoop()->Run();
 }
 
 }  // namespace content