Require explicit selection of traits for LazyInstance

content/shell/android/shell_manager.cc

 // Copyright (c) 2012 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 "content/shell/android/shell_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "jni/ShellManager_jni.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 struct GlobalState {
   GlobalState() {}
   base::android::ScopedJavaGlobalRef<jobject> j_shell_manager;
 };
 
-base::LazyInstance<GlobalState> g_global_state = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<GlobalState>::DestructorAtExit g_global_state =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace content {
 
 ScopedJavaLocalRef<jobject> CreateShellView(Shell* shell) {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_ShellManager_createShell(env,
                                        g_global_state.Get().j_shell_manager,
                                        reinterpret_cast<intptr_t>(shell));
@@ skipping 22 matching lines @@
   ShellBrowserContext* browserContext =
       ShellContentBrowserClient::Get()->browser_context();
   GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
   Shell::CreateNewWindow(browserContext,
                          url,
                          NULL,
                          gfx::Size());
 }
 
 }  // namespace content