Rewrite media::Pipeline state transition machinery and simplify shutdown.

media/base/media_log.h

 // 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.
 
 #ifndef MEDIA_BASE_MEDIA_LOG_H_
 #define MEDIA_BASE_MEDIA_LOG_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log_event.h"
 #include "media/base/pipeline.h"
 #include "media/base/pipeline_status.h"
 
 namespace media {
 
 class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> {
  public:
   // Convert various enums to strings.
   static const char* EventTypeToString(MediaLogEvent::Type type);
-  static const char* PipelineStateToString(Pipeline::State);
   static const char* PipelineStatusToString(PipelineStatus);
 
   MediaLog();
 
   // Add an event to this log. Overriden by inheritors to actually do something
   // with it.
   virtual void AddEvent(scoped_ptr<MediaLogEvent> event);
 
   // Helper methods to create events and their parameters.
   scoped_ptr<MediaLogEvent> CreateEvent(MediaLogEvent::Type type);
@@ skipping 20 matching lines @@
  private:
   // A unique (to this process) id for this MediaLog.
   int32 id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaLog);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_LOG_H_