Require explicit selection of traits for LazyInstance

content/public/test/nested_message_pump_android.cc

 // Copyright 2013 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/public/test/nested_message_pump_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "jni/NestedSystemMessageHandler_jni.h"
 
 namespace {
 
-base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >
-    g_message_handler_obj = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject>>::
+    DestructorAtExit g_message_handler_obj = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 
 namespace content {
 
 struct NestedMessagePumpAndroid::RunState {
   RunState(base::MessagePump::Delegate* delegate, int run_depth)
       : delegate(delegate),
         run_depth(run_depth),
@@ skipping 115 matching lines @@
   if (state_) {
     // We know that we can't be blocked on Wait right now since this method can
     // only be called on the same thread as Run, so we only need to update our
     // record of how long to sleep when we do sleep.
     state_->delayed_work_time = delayed_work_time;
     return;
   }
 }
 
 }  // namespace content