Require explicit selection of traits for LazyInstance

content/app/android/child_process_service_impl.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/app/android/child_process_service_impl.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
@@ skipping 76 matching lines @@
 
   // Overridden from GpuSurfaceLookup:
   gl::ScopedJavaSurface AcquireJavaSurface(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     return gl::ScopedJavaSurface(
         content::Java_ChildProcessServiceImpl_getViewSurface(env, service_impl_,
                                                              surface_id));
   }
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<ChildProcessSurfaceManager>;
+  friend struct base::LazyInstanceTraitsBase<ChildProcessSurfaceManager>;
   // The instance of org.chromium.content.app.ChildProcessServiceImpl.
   base::android::ScopedJavaGlobalRef<jobject> service_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessSurfaceManager);
 };
 
 static base::LazyInstance<ChildProcessSurfaceManager>::Leaky
     g_child_process_surface_manager = LAZY_INSTANCE_INITIALIZER;
 
 // Chrome actually uses the renderer code path for all of its child
@@ skipping 78 matching lines @@
 
 bool RegisterChildProcessServiceImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ChildThreadImpl::ShutdownThread();
 }
 
 }  // namespace content