Clean up compositor initialization/destruction.

content/browser/web_contents/web_contents_view_aura_browsertest.cc

Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
index caa07a41346cfdf77d5117506945f16fb381e60c..e0f34abe4fcf1719814161ee2fdab90ecaf2397b 100644
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -24,7 +24,6 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
-#include "ui/compositor/compositor_setup.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 
 namespace content {
@@ -87,6 +86,11 @@ class WebContentsViewAuraTest : public ContentBrowserTest {
       : screenshot_manager_(NULL) {
   }
 
+  virtual void SetUp() OVERRIDE {
+    // TODO(jbauman): Remove this. http://crbug.com/268644
+    UseRealGLContexts();
+  }
+
   // Executes the javascript synchronously and makes sure the returned value is
   // freed properly.
   void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) {
@@ -326,9 +330,6 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
 //    gesture.
 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
                        OverscrollScreenshot) {
-  // http://crbug.com/268644
-  if (ui::IsTestCompositorEnabled())
-    return;
   ASSERT_NO_FATAL_FAILURE(
       StartTestWithPage("files/overscroll_navigation.html"));
   WebContentsImpl* web_contents =
@@ -423,9 +424,6 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
 // RenderViewHost to be swapped out.
 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
                        ScreenshotForSwappedOutRenderViews) {
-  // http://crbug.com/268644
-  if (ui::IsTestCompositorEnabled())
-    return;
   ASSERT_NO_FATAL_FAILURE(
       StartTestWithPage("files/overscroll_navigation.html"));
   // Create a new server with a different site.