aura: Clean up compositor initialization/destruction.

content/browser/gpu/gpu_info_browsertest.cc

Index: content/browser/gpu/gpu_info_browsertest.cc
diff --git a/content/browser/gpu/gpu_info_browsertest.cc b/content/browser/gpu/gpu_info_browsertest.cc
index 72487d43e8fb0b3dcc48d5a8669eb6593301ddac..d555d1d05f04d8839424926b9c4fe346ae425770 100644
--- a/content/browser/gpu/gpu_info_browsertest.cc
+++ b/content/browser/gpu/gpu_info_browsertest.cc
@@ -11,7 +11,6 @@
 #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 {
 
@@ -74,9 +73,11 @@ class GpuInfoBrowserTest : public ContentBrowserTest {
       : message_loop_(base::MessageLoop::TYPE_UI) {
   }
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    ContentBrowserTest::SetUpInProcessBrowserTestFixture();
-    ui::DisableTestCompositor();
+  virtual void SetUp() {
+    // We expect real pixel output for these tests.
+    UseRealGLContexts();
+
+    ContentBrowserTest::SetUp();
   }
 
   base::MessageLoop* GetMessageLoop() { return &message_loop_; }