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

Currently tests initialize GL by calling into methods that should be
internal to the gl bindings code. Instead, everyone should go through
GLSurface::InitializeOneOff.

Also GLSurface::InitializeOneOff early outs if it was already called,
leading to a pattern of initializing GL all over the place just in case
and not having a clear idea of where it should be set up. Instead, DCHECK
that it is not called more than once, and move calls to this method to
be during process startup for unit test suites instead of mid-test.

This adds two test variants of InitializeOneOff for tests to call, that
set up OSMesa or Mock GL bindings, via GLSurface::InitializeOneOff.

R=piman, sievers
BUG=270918

Review URL: https://codereview.chromium.org/135213003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247793 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 170b364..63f850f 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();
 }