Merge Pipeline's kError state with kStopped: a baby step towards bringing sanity to shutdown.

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/logging.h"
@@ skipping 69 matching lines @@
     case Pipeline::kFlushing:
       return "flushing";
     case Pipeline::kStarting:
       return "starting";
     case Pipeline::kStarted:
       return "started";
     case Pipeline::kStopping:
       return "stopping";
     case Pipeline::kStopped:
       return "stopped";
-    case Pipeline::kError:
-      return "error";
   }
   NOTREACHED();
   return NULL;
 }
 
 const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
   switch (status) {
     case PIPELINE_OK:
       return "pipeline: ok";
     case PIPELINE_ERROR_URL_NOT_FOUND:
@@ skipping 107 matching lines @@
     size_t start, size_t current, size_t end) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
   event->params.SetInteger("buffer_start", start);
   event->params.SetInteger("buffer_current", current);
   event->params.SetInteger("buffer_end", end);
   return event.Pass();
 }
 
 }  //namespace media