Require explicit selection of traits for LazyInstance

chrome/browser/media_galleries/imported_media_gallery_registry.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 37 matching lines @@
   // Path where all virtual file systems are "mounted."
   base::FilePath ImportedRoot();
 
   // Should be called on the MediaTaskRunner thread only.
 #if defined(OS_WIN) || defined(OS_MACOSX)
   static picasa::PicasaDataProvider* PicasaDataProvider();
   static itunes::ITunesDataProvider* ITunesDataProvider();
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<ImportedMediaGalleryRegistry>;
+  friend struct base::LazyInstanceTraitsBase<ImportedMediaGalleryRegistry>;
   friend class itunes::ITunesDataProviderTest;
   friend class picasa::PicasaDataProviderTest;
 
   ImportedMediaGalleryRegistry();
   virtual ~ImportedMediaGalleryRegistry();
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void RegisterPicasaFileSystem(const base::FilePath& database_path);
   void RevokePicasaFileSystem();
 
@@ skipping 15 matching lines @@
 #ifndef NDEBUG
   base::FilePath picasa_database_path_;
   base::FilePath itunes_xml_library_path_;
 #endif
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
   DISALLOW_COPY_AND_ASSIGN(ImportedMediaGalleryRegistry);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_