Require explicit selection of traits for LazyInstance

content/browser/android/content_view_statics.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 <jni.h>
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 74 matching lines @@
                                                suspended_processes_.end(),
                                                host->GetID());
     DCHECK(pos != suspended_processes_.end());
     host->RemoveObserver(this);
     suspended_processes_.erase(pos);
   }
 
   std::vector<int /* RenderProcessHost id */> suspended_processes_;
 };
 
-base::LazyInstance<SuspendedProcessWatcher> g_suspended_processes_watcher =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<SuspendedProcessWatcher>::DestructorAtExit
+    g_suspended_processes_watcher = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // Returns the first substring consisting of the address of a physical location.
 static ScopedJavaLocalRef<jstring> FindAddress(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jstring>& addr) {
   base::string16 content_16 = ConvertJavaStringToUTF16(env, addr);
   base::string16 result_16;
@@ skipping 12 matching lines @@
   }
 }
 
 namespace content {
 
 bool RegisterWebViewStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content