Remove two static initializers (media/base/{buffers,media_log}.cc)

media/base/media_log.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 "media/base/media_log.h"
 
 #include <string>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 namespace media {
 
 // A count of all MediaLogs created on this render process.
 // Used to generate unique ids.
-static base::AtomicSequenceNumber media_log_count(base::LINKER_INITIALIZED);
+static base::LazyInstance<base::AtomicSequenceNumber> media_log_count =

[Nico, 2012/01/18 03:48:31]

This needs LeakyLakyInstanceTraits as 2nd template parameter, else it registers
something to run atexit()

[Ami GONE FROM CHROMIUM, 2012/01/18 04:52:31]

As you wish: https://chromiumcodereview.appspot.com/9253006

+    LAZY_INSTANCE_INITIALIZER;
 
 const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) {
   switch (type) {
     case MediaLogEvent::WEBMEDIAPLAYER_CREATED:
       return "WEBMEDIAPLAYER_CREATED";
     case MediaLogEvent::WEBMEDIAPLAYER_DESTROYED:
       return "WEBMEDIAPLAYER_DESTROYED";
     case MediaLogEvent::PIPELINE_CREATED:
       return "PIPELINE_CREATED";
     case MediaLogEvent::PIPELINE_DESTROYED:
@@ skipping 107 matching lines @@
     case DECODER_ERROR_NOT_SUPPORTED:
       return "decoder: not supported";
     case DATASOURCE_ERROR_URL_NOT_SUPPORTED:
       return "data source: url not supported";
   }
   NOTREACHED();
   return NULL;
 }
 
 MediaLog::MediaLog() {
-  id_ = media_log_count.GetNext();
+  id_ = media_log_count.Get().GetNext();
   stats_update_pending_ = false;
 }
 
 MediaLog::~MediaLog() {}
 
 void MediaLog::AddEvent(scoped_ptr<MediaLogEvent> event) {
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateEvent(MediaLogEvent::Type type) {
   scoped_ptr<MediaLogEvent> event(new MediaLogEvent);
@@ skipping 95 matching lines @@
                            last_statistics_.video_bytes_decoded);
   event->params.SetInteger("video_frames_decoded",
                            last_statistics_.video_frames_decoded);
   event->params.SetInteger("video_frames_dropped",
                            last_statistics_.video_frames_dropped);
   AddEvent(event.Pass());
   stats_update_pending_ = false;
 }
 
 }  //namespace media