Require explicit selection of traits for LazyInstance

content/browser/android/java/java_bridge_thread.cc

 // Copyright 2015 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/browser/android/java/java_bridge_thread.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "build/build_config.h"
 
 #if !defined(OS_ANDROID)
 #error "JavaBridge only supports OS_ANDROID"
 #endif
 
 namespace content {
 
 namespace {
 
-base::LazyInstance<JavaBridgeThread> g_background_thread =
+base::LazyInstance<JavaBridgeThread>::DestructorAtExit g_background_thread =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 JavaBridgeThread::JavaBridgeThread()
     : base::android::JavaHandlerThread("JavaBridge") {
   Start();
 }
 
 JavaBridgeThread::~JavaBridgeThread() {
   Stop();
 }
 
 // static
 bool JavaBridgeThread::CurrentlyOn() {
   return g_background_thread.Get()
       .message_loop()
       ->task_runner()
       ->BelongsToCurrentThread();
 }
 
 // static
 base::TaskRunner* JavaBridgeThread::GetTaskRunner() {
   return g_background_thread.Get().message_loop()->task_runner().get();
 }
 
 }  // namespace content