Require explicit selection of traits for LazyInstance

android_webview/browser/deferred_gpu_command_service.cc

 // Copyright 2014 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/deferred_gpu_command_service.h"
 
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/browser/gpu_utils.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/framebuffer_completeness_cache.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 
 namespace android_webview {
 
 namespace {
-base::LazyInstance<scoped_refptr<DeferredGpuCommandService> >
+base::LazyInstance<scoped_refptr<DeferredGpuCommandService>>::DestructorAtExit
     g_service = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
-base::LazyInstance<base::ThreadLocalBoolean> ScopedAllowGL::allow_gl;
+base::LazyInstance<base::ThreadLocalBoolean>::DestructorAtExit
+    ScopedAllowGL::allow_gl;
 
 // static
 bool ScopedAllowGL::IsAllowed() {
   return allow_gl.Get().Get();
 }
 
 ScopedAllowGL::ScopedAllowGL() {
   DCHECK(!allow_gl.Get().Get());
   allow_gl.Get().Set(true);
 
@@ skipping 163 matching lines @@
 
 void DeferredGpuCommandService::Release() const {
   base::RefCountedThreadSafe<DeferredGpuCommandService>::Release();
 }
 
 bool DeferredGpuCommandService::BlockThreadOnWaitSyncToken() const {
   return true;
 }
 
 }  // namespace android_webview