One less lock.

ui/gfx/gl/gl_implementation_linux.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
-#include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
 namespace gfx {
 namespace {
 
 // TODO(piman): it should be Desktop GL marshalling from double to float. Today
 // on native GLES, we do float->double->float.
 void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) {
@@ skipping 14 matching lines @@
     VLOG(1) << "Failed to load " << filename.MaybeAsASCII() << ": " << error;
     return NULL;
   }
   return library;
 }
 
 base::NativeLibrary LoadLibrary(const char* filename) {
   return LoadLibrary(FilePath(filename));
 }
 
-// TODO(backer): Find a more principled (less heavy handed) way to prevent a
-// race in the bindings initialization.
-#if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(TOUCH_UI)
-base::LazyInstance<base::Lock,
-                   base::LeakyLazyInstanceTraits<base::Lock> >
-    g_lock = LAZY_INSTANCE_INITIALIZER;
-#endif
-
 }  // namespace anonymous
 
 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
   impls->push_back(kGLImplementationDesktopGL);
   impls->push_back(kGLImplementationEGLGLES2);
   impls->push_back(kGLImplementationOSMesaGL);
 }
 
 bool InitializeGLBindings(GLImplementation implementation) {
-#if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(TOUCH_UI)
-  base::AutoLock locked(g_lock.Get());
-#endif
   // Prevent reinitialization with a different implementation. Once the gpu
   // unit tests have initialized with kGLImplementationMock, we don't want to
   // later switch to another GL implementation.
   if (GetGLImplementation() != kGLImplementationNone)
     return true;
 
   // Allow the main thread or another to initialize these bindings
   // after instituting restrictions on I/O. Going forward they will
   // likely be used in the browser process on most platforms. The
   // one-time initialization cost is small, between 2 and 5 ms.
@@ skipping 148 matching lines @@
 #if !defined(USE_WAYLAND)
   ClearGLBindingsGLX();
   ClearGLBindingsOSMESA();
 #endif
   SetGLImplementation(kGLImplementationNone);
 
   UnloadGLNativeLibraries();
 }
 
 }  // namespace gfx