Require explicit selection of traits for LazyInstance

content/common/plugin_list.h

 // 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.
 
 #ifndef CONTENT_COMMON_PLUGIN_LIST_H_
 #define CONTENT_COMMON_PLUGIN_LIST_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 114 matching lines @@
   virtual ~PluginList();
 
  private:
   enum LoadingState {
     LOADING_STATE_NEEDS_REFRESH,
     LOADING_STATE_REFRESHING,
     LOADING_STATE_UP_TO_DATE,
   };
 
   friend class PluginListTest;
-  friend struct base::DefaultLazyInstanceTraits<PluginList>;
+  friend struct base::LazyInstanceTraitsBase<PluginList>;
 
   PluginList();
 
   // Load all plugins from the default plugins directory.
   void LoadPlugins();
 
   // Returns true if the given plugin supports a given file extension.
   // |extension| should be all lower case. If |mime_type| is not NULL, it will
   // be set to the MIME type if found. The MIME type which corresponds to the
   // extension is optionally returned back.
@@ skipping 29 matching lines @@
   // Need synchronization for the above members since this object can be
   // accessed on multiple threads.
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_PLUGIN_LIST_H_