Require explicit selection of traits for LazyInstance

android_webview/browser/scoped_app_gl_state_restore.cc

 // Copyright 2013 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 "android_webview/browser/scoped_app_gl_state_restore.h"
 
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 17 matching lines @@
                                           gl::GLContextAttribs())) {}
   void MakeCurrent() { context->MakeCurrent(surface.get()); }
 
  private:
   scoped_refptr<gl::GLSurfaceStub> surface;
   scoped_refptr<gl::GLContext> context;
 
   DISALLOW_COPY_AND_ASSIGN(AppContextSurface);
 };
 
-base::LazyInstance<AppContextSurface> g_app_context_surface =
+base::LazyInstance<AppContextSurface>::DestructorAtExit g_app_context_surface =
     LAZY_INSTANCE_INITIALIZER;
 
 // Make the global g_app_context_surface current so that the gl_binding is not
 // NULL for making gl* calls. The binding can be null if another GlContext was
 // destroyed immediately before gl* calls here.
 void MakeAppContextCurrent() {
   g_app_context_surface.Get().MakeCurrent();
 }
 
 void GLEnableDisable(GLenum cap, bool enable) {
@@ skipping 388 matching lines @@
 }
 
 StencilState ScopedAppGLStateRestore::stencil_state() const {
   return impl_->stencil_state();
 }
 int ScopedAppGLStateRestore::framebuffer_binding_ext() const {
   return impl_->framebuffer_binding_ext();
 }
 
 }  // namespace android_webview