Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/content/public/test/browser_test_base.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
@@ skipping 91 matching lines @@
   // this.
   // |test_server_base| is the path, relative to src, to give to the test HTTP
   // server.
   void CreateTestServer(const base::FilePath& test_server_base);
 
   // When the test is running in --single-process mode, runs the given task on
   // the in-process renderer thread. A nested message loop is run until it
   // returns.
   void PostTaskToInProcessRendererAndWait(const base::Closure& task);
 
-  // Call this before SetUp() to use real GL contexts in Compositor for the
-  // test.
-  void UseRealGLContexts() { allow_test_contexts_ = false; }
-
-  // Call this before SetUp() to use real GL drivers instead of OSMesa for the
-  // test.
-  void UseRealGLBindings() { allow_osmesa_ = false; }
-
  private:
   void ProxyRunTestOnMainThreadLoop();
 
   // Testing server, started on demand.
   scoped_ptr<net::SpawnedTestServer> test_server_;
 
   // Embedded test server, cheap to create, started on demand.
   scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
 
-  // When false, the ui::Compositor will be forced to use real GL contexts for
-  // the test, so that it produces real pixel output.
-  bool allow_test_contexts_;
-
-  // When false, the GL backend will use a real GPU. When true, it uses OSMesa
-  // to run GL on the CPU in a way that works across all platforms.
-  bool allow_osmesa_;
-
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_