Require explicit selection of traits for LazyInstance

chrome/browser/media_galleries/fileapi/supported_audio_video_checker.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 "chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h"
 
 #include <stddef.h>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 19 matching lines @@
     net::GetExtensionsForMimeType("audio/*", &extensions);
     net::GetExtensionsForMimeType("video/*", &extensions);
     for (size_t i = 0; i < extensions.size(); ++i) {
       std::string mime_type;
       if (net::GetWellKnownMimeTypeFromExtension(extensions[i], &mime_type) &&
           mime_util::IsSupportedMimeType(mime_type)) {
         audio_video_extensions_.insert(
             base::FilePath::kExtensionSeparator + extensions[i]);
       }
     }
-  };
+  }
 
   bool HasSupportedAudioVideoExtension(const base::FilePath& file) {
     return base::ContainsKey(audio_video_extensions_, file.Extension());
   }
 
  private:
   std::set<base::FilePath::StringType> audio_video_extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(SupportedAudioVideoExtensions);
 };
 
-base::LazyInstance<SupportedAudioVideoExtensions> g_audio_video_extensions =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<SupportedAudioVideoExtensions>::DestructorAtExit
+    g_audio_video_extensions = LAZY_INSTANCE_INITIALIZER;
 
 base::File OpenOnFileThread(const base::FilePath& path) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   return base::File(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
 }
 
 }  // namespace
 
 SupportedAudioVideoChecker::~SupportedAudioVideoChecker() {}
 
@@ skipping 25 matching lines @@
 void SupportedAudioVideoChecker::OnFileOpen(base::File file) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (!file.IsValid()) {
     callback_.Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
   safe_checker_ = new SafeAudioVideoChecker(std::move(file), callback_);
   safe_checker_->Start();
 }