Require explicit selection of traits for LazyInstance

extensions/browser/extension_api_frame_id_map.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_
 #define EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_
 
 #include <list>
 #include <map>
 #include <memory>
@@ skipping 123 matching lines @@
   // If this method is not called, the cached mapping for the frame is retained
   // forever.
   void RemoveFrameData(content::RenderFrameHost* rfh);
 
   // Updates the tab and window id for the given RenderFrameHost, if any exists.
   void UpdateTabAndWindowId(int tab_id,
                             int window_id,
                             content::RenderFrameHost* rfh);
 
  protected:
-  friend struct base::DefaultLazyInstanceTraits<ExtensionApiFrameIdMap>;
+  friend struct base::LazyInstanceTraitsBase<ExtensionApiFrameIdMap>;
 
   // A set of identifiers that uniquely identifies a RenderFrame.
   struct RenderFrameIdKey {
     RenderFrameIdKey();
     RenderFrameIdKey(int render_process_id, int frame_routing_id);
 
     // The process ID of the renderer that contains the RenderFrame.
     int render_process_id;
 
     // The routing ID of the RenderFrame.
@@ skipping 54 matching lines @@
   // This lock protects |frame_data_map_| from being concurrently written on the
   // UI thread and read on the IO thread.
   base::Lock frame_data_map_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionApiFrameIdMap);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EXTENSION_API_FRAME_ID_MAP_H_