Remove a few unused media::PipelineStatus codes.

BUG=126070
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10316015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135197 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 21 deletions

diff --git a/media/base/composite_filter_unittest.cc b/media/base/composite_filter_unittest.cc
index e5442d7..a8d667a 100644
--- a/media/base/composite_filter_unittest.cc
+++ b/media/base/composite_filter_unittest.cc
@@ -458,10 +458,10 @@ TEST_F(CompositeFilterTest, TestPlayErrors) {
 
   // At this point Play() has been called on |filter_2_|. Simulate an
   // error by calling SetError() on its FilterHost interface.
-  filter_2_->host()->SetError(PIPELINE_ERROR_OUT_OF_MEMORY);
+  filter_2_->host()->SetError(PIPELINE_ERROR_DECODE);
 
   // Expect error to be reported and "play done" callback to be called.
-  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_OUT_OF_MEMORY));
+  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_DECODE));
   EXPECT_CALL(*callback, Run());
 
   // Run callback to indicate that |filter_2_|'s Play() has completed.
@@ -532,10 +532,10 @@ TEST_F(CompositeFilterTest, TestPauseErrors) {
 
   // Simulate an error by calling SetError() on |filter_1_|'s FilterHost
   // interface.
-  filter_1_->host()->SetError(PIPELINE_ERROR_OUT_OF_MEMORY);
+  filter_1_->host()->SetError(PIPELINE_ERROR_DECODE);
 
   // Expect error to be reported and "pause done" callback to be called.
-  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_OUT_OF_MEMORY));
+  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_DECODE));
   EXPECT_CALL(*callback, Run());
 
   RunFilter1Callback();
@@ -599,12 +599,12 @@ TEST_F(CompositeFilterTest, TestFlushErrors) {
 
   // Simulate an error by calling SetError() on |filter_1_|'s FilterHost
   // interface.
-  filter_1_->host()->SetError(PIPELINE_ERROR_OUT_OF_MEMORY);
+  filter_1_->host()->SetError(PIPELINE_ERROR_DECODE);
 
   RunFilter1Callback();
 
   // Expect error to be reported and "pause done" callback to be called.
-  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_OUT_OF_MEMORY));
+  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_DECODE));
   EXPECT_CALL(*callback, Run());
 
   RunFilter2Callback();
@@ -752,8 +752,8 @@ TEST_F(CompositeFilterTest, TestErrorWhilePlaying) {
   DoPlay();
 
   // Simulate an error on |filter_2_| while playing.
-  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_OUT_OF_MEMORY));
-  filter_2_->host()->SetError(PIPELINE_ERROR_OUT_OF_MEMORY);
+  EXPECT_CALL(*mock_filter_host_, SetError(PIPELINE_ERROR_DECODE));
+  filter_2_->host()->SetError(PIPELINE_ERROR_DECODE);
 
   DoPause();
 
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index d1ac7de..3be4366 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -118,14 +118,10 @@ const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
       return "pipeline: initialization failed";
     case PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
       return "pipeline: required filter missing";
-    case PIPELINE_ERROR_OUT_OF_MEMORY:
-      return "pipeline: out of memory";
     case PIPELINE_ERROR_COULD_NOT_RENDER:
       return "pipeline: could not render";
     case PIPELINE_ERROR_READ:
       return "pipeline: read error";
-    case PIPELINE_ERROR_AUDIO_HARDWARE:
-      return "pipeline: audio hardware error";
     case PIPELINE_ERROR_OPERATION_PENDING:
       return "pipeline: operation pending";
     case PIPELINE_ERROR_INVALID_STATE:
@@ -136,12 +132,8 @@ const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
       return "dumuxer: could not parse";
     case DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
       return "demuxer: no supported streams";
-    case DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
-      return "demuxer: could not create thread";
     case DECODER_ERROR_NOT_SUPPORTED:
       return "decoder: not supported";
-    case DATASOURCE_ERROR_URL_NOT_SUPPORTED:
-      return "data source: url not supported";
   }
   NOTREACHED();
   return NULL;
diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h
index c863fa6..842b18d 100644
--- a/media/base/pipeline_status.h
+++ b/media/base/pipeline_status.h
@@ -19,21 +19,16 @@ enum PipelineStatus {
   PIPELINE_ERROR_ABORT,
   PIPELINE_ERROR_INITIALIZATION_FAILED,
   PIPELINE_ERROR_REQUIRED_FILTER_MISSING,
-  PIPELINE_ERROR_OUT_OF_MEMORY,
   PIPELINE_ERROR_COULD_NOT_RENDER,
   PIPELINE_ERROR_READ,
-  PIPELINE_ERROR_AUDIO_HARDWARE,
   PIPELINE_ERROR_OPERATION_PENDING,
   PIPELINE_ERROR_INVALID_STATE,
   // Demuxer related errors.
   DEMUXER_ERROR_COULD_NOT_OPEN,
   DEMUXER_ERROR_COULD_NOT_PARSE,
   DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
-  DEMUXER_ERROR_COULD_NOT_CREATE_THREAD,
   // Decoder related errors.
   DECODER_ERROR_NOT_SUPPORTED,
-  // DataSourceFactory errors.
-  DATASOURCE_ERROR_URL_NOT_SUPPORTED,
 };
 
 typedef base::Callback<void(PipelineStatus)> PipelineStatusCB;