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

trunk/src/content/gpu/gpu_child_thread.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/gpu/gpu_child_thread.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
@@ skipping 47 matching lines @@
 GpuChildThread::GpuChildThread(const std::string& channel_id)
     : ChildThread(channel_id),
       dead_on_arrival_(false),
       in_browser_process_(true) {
 #if defined(OS_WIN)
   target_services_ = NULL;
 #endif
   DCHECK(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) ||
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU));
-#if !defined(OS_ANDROID)
   // For single process and in-process GPU mode, we need to load and
   // initialize the GL implementation and locate the GL entry points here.
-  // On Android, GLSurface::InitializeOneOff() is called from BrowserMainLoop
-  // before getting here. crbug.com/326295
-  if (!gfx::GLSurface::InitializeOneOff())
-    VLOG(1) << "gfx::GLSurface::InitializeOneOff failed";
-#endif
+  if (!gfx::GLSurface::InitializeOneOff()) {
+    VLOG(1) << "gfx::GLSurface::InitializeOneOff()";
+  }
   g_thread_safe_sender.Get() = thread_safe_sender();
 }
 
 GpuChildThread::~GpuChildThread() {
 }
 
 void GpuChildThread::Shutdown() {
   ChildThread::Shutdown();
   logging::SetLogMessageHandler(NULL);
 }
@@ skipping 148 matching lines @@
     // the future posting of tasks to the message loop.
     if (watchdog_thread_->message_loop())
       watchdog_thread_->PostAcknowledge();
     // Prevent rearming.
     watchdog_thread_->Stop();
   }
 }
 
 }  // namespace content