Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/ui/aura/bench/bench_main.cc

 // 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.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 11 matching lines @@
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
-#include "ui/gl/gl_surface.h"
-
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 #if defined(USE_X11)
 #include "base/message_loop/message_pump_x11.h"
 #endif
 
 using base::TimeTicks;
@@ skipping 242 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench);
 };
 
 }  // namespace
 
 int main(int argc, char** argv) {
   CommandLine::Init(argc, argv);
 
   base::AtExitManager exit_manager;
 
-  gfx::GLSurface::InitializeOneOff();
-
   // The ContextFactory must exist before any Compositors are created.
   bool allow_test_contexts = false;
   ui::InitializeContextFactoryForTests(allow_test_contexts);
 
   base::i18n::InitializeICU();
 
   base::MessageLoopForUI message_loop;
   aura::Env::CreateInstance();
   scoped_ptr<aura::TestScreen> test_screen(
       aura::TestScreen::CreateFullscreen());
@@ skipping 48 matching lines @@
   ui::PrintLayerHierarchy(root_window->window()->layer(), gfx::Point(100, 100));
 #endif
 
   root_window->host()->Show();
   base::MessageLoopForUI::current()->Run();
   focus_client.reset();
   root_window.reset();
 
   return 0;
 }