Remove LazyInstance usage from media/

content/browser/media/media_internals.cc

 // 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.
 
 #include "content/browser/media/media_internals.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 15 matching lines @@
 #include "media/base/audio_parameters.h"
 #include "media/base/media_log_event.h"
 #include "media/filters/gpu_video_decoder.h"
 
 #if !defined(OS_ANDROID)
 #include "media/filters/decrypting_video_decoder.h"
 #endif
 
 namespace {
 
-static base::LazyInstance<content::MediaInternals>::Leaky g_media_internals =
-    LAZY_INSTANCE_INITIALIZER;
-
 base::string16 SerializeUpdate(const std::string& function,
                                const base::Value* value) {
   return content::WebUI::GetJavascriptCall(
       function, std::vector<const base::Value*>(1, value));
 }
 
 std::string EffectsToString(int effects) {
   if (effects == media::AudioParameters::NO_EFFECTS)
     return "NO_EFFECTS";
 
@@ skipping 540 matching lines @@
   while (it != players_it->second.end()) {
     ReportUMAForPipelineStatus(it->second);
     FinalizeWatchTime(it->second.has_video, &(it->second.watch_time_info),
                       FinalizeType::EVERYTHING);
     players_it->second.erase(it++);
   }
   renderer_info_.erase(players_it);
 }
 
 MediaInternals* MediaInternals::GetInstance() {
-  return g_media_internals.Pointer();
+  static content::MediaInternals* internals = new content::MediaInternals();
+  return internals;
 }
 
 MediaInternals::MediaInternals()
     : can_update_(false),
       owner_ids_(),
       uma_handler_(new MediaInternalsUMAHandler()) {
   registrar_.Add(this, NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllBrowserContextsAndSources());
 }
 
@@ skipping 236 matching lines @@
           audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict));
       existing_dict->MergeDictionary(value);
     }
   }
 
   if (CanUpdate())
     SendUpdate(SerializeUpdate(function, value));
 }
 
 }  // namespace content