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

trunk/src/content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ skipping 52 matching lines @@
 #include "ui/base/clipboard/clipboard.h"
 
 #if defined(USE_AURA)
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/browser_startup_controller.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
-#include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "content/browser/theme_helper_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
@@ skipping 857 matching lines @@
   // (this thread is UI thread, and io_thread_ is for IPCs).
   io_thread_->SetPriority(base::kThreadPriority_Display);
   base::PlatformThread::SetThreadPriority(
       base::PlatformThread::CurrentHandle(),
       base::kThreadPriority_Display);
 #endif
 
 #if !defined(OS_IOS)
   HistogramSynchronizer::GetInstance();
 
-#if defined(OS_ANDROID)
-  // On Android, GLSurface::InitializeOneOff() must be called before initalizing
-  // the GpuDataManagerImpl as it uses the GL bindings. crbug.com/326295
-  if (!gfx::GLSurface::InitializeOneOff())
-    LOG(FATAL) << "GLSurface::InitializeOneOff failed";
-#endif
-
   // Initialize the GpuDataManager before we set up the MessageLoops because
   // otherwise we'll trigger the assertion about doing IO on the UI thread.
   GpuDataManagerImpl::GetInstance()->Initialize();
 
   bool always_uses_gpu = IsForceCompositingModeEnabled();
   bool established_gpu_channel = false;
 #if defined(USE_AURA) || defined(OS_ANDROID)
   established_gpu_channel =
       !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) ||
       parsed_command_line_.HasSwitch(switches::kSingleProcess) ||
@@ skipping 157 matching lines @@
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       trace_file, TracingController::TracingFileResultCallback());
 }
 
 }  // namespace content