Require explicit selection of traits for LazyInstance

extensions/renderer/messaging_bindings.cc

 // Copyright 2014 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 "extensions/renderer/messaging_bindings.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
@@ skipping 36 matching lines @@
 //   port.postMessage('I got your reponse');
 // });
 
 namespace extensions {
 
 using v8_helpers::ToV8String;
 
 namespace {
 
 // A global map between ScriptContext and MessagingBindings.
-base::LazyInstance<std::map<ScriptContext*, MessagingBindings*>>
-    g_messaging_map = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<std::map<ScriptContext*, MessagingBindings*>>::
+    DestructorAtExit g_messaging_map = LAZY_INSTANCE_INITIALIZER;
 
 void HasMessagePort(const PortId& port_id,
                     bool* has_port,
                     ScriptContext* script_context) {
   if (*has_port)
     return;  // Stop checking if the port was found.
 
   MessagingBindings* bindings = g_messaging_map.Get()[script_context];
   DCHECK(bindings);
   // No need for |=; we know this is false right now from above.
@@ skipping 476 matching lines @@
     ports_.erase(iter);
     port->Close(force_close);
   }
 }
 
 int MessagingBindings::GetNextJsId() {
   return next_js_id_++;
 }
 
 }  // namespace extensions