Remove LazyInstance usage from media/

content/renderer/media/render_media_client.cc

 // Copyright 2014 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/renderer/media/render_media_client.h"
 
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/time/default_tick_clock.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 
 namespace content {
 
-static base::LazyInstance<RenderMediaClient>::Leaky g_render_media_client =
-    LAZY_INSTANCE_INITIALIZER;
-
 void RenderMediaClient::Initialize() {
-  g_render_media_client.Get();
+  GetInstance();
 }
 
 RenderMediaClient::RenderMediaClient()
     : has_updated_(false),
       is_update_needed_(true),
       tick_clock_(new base::DefaultTickClock()) {
   media::SetMediaClient(this);
 }
 
 RenderMediaClient::~RenderMediaClient() {
@@ skipping 83 matching lines @@
 
   NOTREACHED();
   return false;
 }
 
 void RenderMediaClient::SetTickClockForTesting(
     std::unique_ptr<base::TickClock> tick_clock) {
   tick_clock_.swap(tick_clock);
 }
 
-// This functions is for testing purpose only. The declaration in the
-// header file is guarded by "#if defined(UNIT_TEST)" so that it can be used
-// by tests but not non-test code. However, this .cc file is compiled as part of
-// "content" where "UNIT_TEST" is not defined. So we need to specify
-// "CONTENT_EXPORT" here again so that it is visible to tests.
-CONTENT_EXPORT RenderMediaClient* GetRenderMediaClientInstanceForTesting() {
-  return g_render_media_client.Pointer();
+// static
+RenderMediaClient* RenderMediaClient::GetInstance() {
+  static RenderMediaClient* client = new RenderMediaClient();
+  return client;
 }
 
 }  // namespace content