Remove LazyInstance usage from media/

media/cdm/external_clear_key_test_helper.cc

 // 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.
 
 #include "media/cdm/external_clear_key_test_helper.h"
 
+#include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/cdm_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
@@ skipping 27 matching lines @@
   // Now load the CDM library.
   base::NativeLibraryLoadError error;
   library_.Reset(base::LoadNativeLibrary(library_path_, &error));
   ASSERT_TRUE(library_.is_valid()) << error.ToString();
 
   // Call INITIALIZE_CDM_MODULE()
   typedef void (*InitializeCdmFunc)();
   InitializeCdmFunc initialize_cdm_func = reinterpret_cast<InitializeCdmFunc>(
       library_.GetFunctionPointer(MAKE_STRING(INITIALIZE_CDM_MODULE)));
   ASSERT_TRUE(initialize_cdm_func) << "No INITIALIZE_CDM_MODULE in library";
+
+  // Loading and unloading this library leaks all static allocations; previously
+  // these were suppressed by a similar annotation in base::LazyInstance. With
+  // the switch to thread-safe statics, we lost the annotation.
+  //
+  // TODO(xhwang): Investigate if we are actually leaking memory during the
+  // normal process by which Chrome uses this library. http://crbug.com/691132.
+  ANNOTATE_SCOPED_MEMORY_LEAK;
   initialize_cdm_func();
 }
 
 void ExternalClearKeyTestHelper::UnloadLibrary() {
   // Call DeinitializeCdmModule()
   typedef void (*DeinitializeCdmFunc)();
   DeinitializeCdmFunc deinitialize_cdm_func =
       reinterpret_cast<DeinitializeCdmFunc>(
           library_.GetFunctionPointer("DeinitializeCdmModule"));
   ASSERT_TRUE(deinitialize_cdm_func) << "No DeinitializeCdmModule() in library";
   deinitialize_cdm_func();
 }
 
 }  // namespace media