Ensure GL initialization only happens once, and provide common init path

content/gpu/gpu_child_thread.cc

Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 170b3648b564ec78fe9d69f4d5a434a10f43850e..63f850fa7f288464eb8d730842b231f976e378af 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -65,11 +65,14 @@ GpuChildThread::GpuChildThread(const std::string& channel_id)
   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.
-  if (!gfx::GLSurface::InitializeOneOff()) {
-    VLOG(1) << "gfx::GLSurface::InitializeOneOff()";
-  }
+  // 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
   g_thread_safe_sender.Get() = thread_safe_sender();
 }