Renamed FilterHost::Error() and Pipeline::GetTime() to more appropriate names.

BUG=17107
TEST=none

Review URL: http://codereview.chromium.org/155711

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

9 files changed, 28 insertions, 26 deletions

diff --git a/media/base/filter_host.h b/media/base/filter_host.h
index 982b3e5..5e70797 100644
--- a/media/base/filter_host.h
+++ b/media/base/filter_host.h
@@ -26,7 +26,7 @@ class FilterHost {
  public:
   // Stops execution of the pipeline due to a fatal error.  Do not call this
   // method with PIPELINE_OK or PIPELINE_STOPPING (used internally by pipeline).
-  virtual void Error(PipelineError error) = 0;
+  virtual void SetError(PipelineError error) = 0;
 
   // Gets the current time in microseconds.
   virtual base::TimeDelta GetTime() const = 0;
diff --git a/media/base/filter_host_impl.cc b/media/base/filter_host_impl.cc
index 4192afd..93e3ca7 100644
--- a/media/base/filter_host_impl.cc
+++ b/media/base/filter_host_impl.cc
@@ -6,12 +6,12 @@
 
 namespace media {
 
-void FilterHostImpl::Error(PipelineError error) {
-  pipeline_internal_->Error(error);
+void FilterHostImpl::SetError(PipelineError error) {
+  pipeline_internal_->SetError(error);
 }
 
 base::TimeDelta FilterHostImpl::GetTime() const {
-  return pipeline()->GetTime();
+  return pipeline()->GetCurrentTime();
 }
 
 void FilterHostImpl::SetTime(base::TimeDelta time) {
diff --git a/media/base/filter_host_impl.h b/media/base/filter_host_impl.h
index cb33a48..a619654 100644
--- a/media/base/filter_host_impl.h
+++ b/media/base/filter_host_impl.h
@@ -16,7 +16,7 @@ namespace media {
 class FilterHostImpl : public FilterHost {
  public:
   // FilterHost interface.
-  virtual void Error(PipelineError error);
+  virtual void SetError(PipelineError error);
   virtual base::TimeDelta GetTime() const;
   virtual void SetTime(base::TimeDelta time);
   virtual void SetDuration(base::TimeDelta duration);
diff --git a/media/base/mock_filter_host.h b/media/base/mock_filter_host.h
index c926437..8bab1b5 100644
--- a/media/base/mock_filter_host.h
+++ b/media/base/mock_filter_host.h
@@ -28,7 +28,7 @@ class MockFilterHost : public FilterHost {
 
   // FilterHost implementation.
   MOCK_METHOD0(InitializationComplete, void());
-  MOCK_METHOD1(Error, void(PipelineError error));
+  MOCK_METHOD1(SetError, void(PipelineError error));
   MOCK_CONST_METHOD0(GetTime, base::TimeDelta());
   MOCK_METHOD1(SetTime, void(base::TimeDelta time));
   MOCK_METHOD1(SetDuration, void(base::TimeDelta duration));
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 6d8c8a9..8c44996 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -332,9 +332,9 @@ void RunFilterCallback(::testing::Unused, FilterCallback* callback);
 // methods.
 void DestroyFilterCallback(::testing::Unused, FilterCallback* callback);
 
-// Helper gmock action that calls Error() on behalf of the provided filter.
-ACTION_P2(Error, filter, error) {
-  filter->host()->Error(error);
+// Helper gmock action that calls SetError() on behalf of the provided filter.
+ACTION_P2(SetError, filter, error) {
+  filter->host()->SetError(error);
 }
 
 }  // namespace media
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index d6f6241..83e30ef 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -81,7 +81,8 @@ class Pipeline {
   // Attempt to seek to the position specified by time.  |seek_callback| will be
   // executed when the all filters in the pipeline have processed the seek.
   //
-  // Clients are expected to call GetTime() to check whether the seek succeeded.
+  // Clients are expected to call GetCurrentTime() to check whether the seek
+  // succeeded.
   virtual void Seek(base::TimeDelta time, PipelineCallback* seek_callback) = 0;
 
   // Returns true if the pipeline has been started via Start().  If IsRunning()
@@ -125,7 +126,7 @@ class Pipeline {
 
   // Gets the current pipeline time. For a pipeline "time" progresses from 0 to
   // the end of the media.
-  virtual base::TimeDelta GetTime() const = 0;
+  virtual base::TimeDelta GetCurrentTime() const = 0;
 
   // Get the approximate amount of playable data buffered so far in micro-
   // seconds.
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 7ef051d..1da8366 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -170,7 +170,7 @@ void PipelineImpl::SetVolume(float volume) {
   }
 }
 
-base::TimeDelta PipelineImpl::GetTime() const {
+base::TimeDelta PipelineImpl::GetCurrentTime() const {
   AutoLock auto_lock(lock_);
   return time_;
 }
@@ -336,7 +336,7 @@ void PipelineInternal::SetTime(base::TimeDelta time) {
 
 // Called from any thread.  Sets the pipeline |error_| member and destroys all
 // filters.
-void PipelineInternal::Error(PipelineError error) {
+void PipelineInternal::SetError(PipelineError error) {
   message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &PipelineInternal::ErrorTask, error));
 }
@@ -444,7 +444,7 @@ void PipelineInternal::InitializeTask() {
 
   if (state_ == kInitVideoRenderer) {
     if (!IsPipelineOk() || pipeline_->rendered_mime_types_.empty()) {
-      Error(PIPELINE_ERROR_COULD_NOT_RENDER);
+      SetError(PIPELINE_ERROR_COULD_NOT_RENDER);
       return;
     }
 
@@ -583,7 +583,7 @@ void PipelineInternal::CreateFilter(FilterFactory* filter_factory,
   // Create the filter.
   scoped_refptr<Filter> filter = filter_factory->Create<Filter>(media_format);
   if (!filter) {
-    Error(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
+    SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
     return;
   }
 
@@ -592,7 +592,7 @@ void PipelineInternal::CreateFilter(FilterFactory* filter_factory,
     scoped_ptr<base::Thread> thread(new base::Thread(GetThreadName<Filter>()));
     if (!thread.get() || !thread->Start()) {
       NOTREACHED() << "Could not start filter thread";
-      Error(PIPELINE_ERROR_INITIALIZATION_FAILED);
+      SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
       return;
     }
 
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h
index e9f44d5..6b97c94 100644
--- a/media/base/pipeline_impl.h
+++ b/media/base/pipeline_impl.h
@@ -45,7 +45,7 @@ class PipelineImpl : public Pipeline {
   virtual void SetPlaybackRate(float playback_rate);
   virtual float GetVolume() const;
   virtual void SetVolume(float volume);
-  virtual base::TimeDelta GetTime() const;
+  virtual base::TimeDelta GetCurrentTime() const;
   virtual base::TimeDelta GetBufferedTime() const;
   virtual base::TimeDelta GetDuration() const;
   virtual int64 GetBufferedBytes() const;
@@ -195,9 +195,10 @@ class PipelineInternal : public base::RefCountedThreadSafe<PipelineInternal> {
   // that have registered a time update callback.
   void SetTime(base::TimeDelta time);
 
-  // Called by a FilterHostImpl on behalf of a filter calling FilterHost::Error.
-  // If the pipeline is running a nested message loop, it will be exited.
-  void Error(PipelineError error);
+  // Called by a FilterHostImpl on behalf of a filter calling
+  // FilterHost::SetError().  If the pipeline is running a nested message loop,
+  // it will be exited.
+  void SetError(PipelineError error);
 
   // Simple accessor used by the FilterHostImpl class to get access to the
   // pipeline object.
@@ -263,7 +264,7 @@ class PipelineInternal : public base::RefCountedThreadSafe<PipelineInternal> {
   //   - StopTask() resets the pipeline to a fresh state, where as ErrorTask()
   //     leaves the pipeline as is for client inspection.
   //   - StopTask() can be scheduled by the client calling Stop(), where as
-  //     ErrorTask() is scheduled as a result of a filter calling Error().
+  //     ErrorTask() is scheduled as a result of a filter calling SetError().
   void StopTask(PipelineCallback* stop_callback);
   void ErrorTask(PipelineError error);
 
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index d6bd285..c3e63e5 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -179,10 +179,10 @@ TEST_F(PipelineImplTest, NotStarted) {
   EXPECT_EQ(1.0f, pipeline_.GetVolume());
   pipeline_.SetVolume(-1.0f);
   EXPECT_EQ(1.0f, pipeline_.GetVolume());
-  pipeline_.SetVolume(1.0f);
-  EXPECT_EQ(1.0f, pipeline_.GetVolume());
+  pipeline_.SetVolume(0.0f);
+  EXPECT_EQ(0.0f, pipeline_.GetVolume());
 
-  EXPECT_TRUE(kZero == pipeline_.GetTime());
+  EXPECT_TRUE(kZero == pipeline_.GetCurrentTime());
   EXPECT_TRUE(kZero == pipeline_.GetBufferedTime());
   EXPECT_TRUE(kZero == pipeline_.GetDuration());
 
@@ -233,8 +233,8 @@ TEST_F(PipelineImplTest, RequiredFilterMissing) {
 
 TEST_F(PipelineImplTest, URLNotFound) {
   EXPECT_CALL(*mocks_->data_source(), Initialize("", NotNull()))
-      .WillOnce(DoAll(Error(mocks_->data_source(),
-                            PIPELINE_ERROR_URL_NOT_FOUND),
+      .WillOnce(DoAll(SetError(mocks_->data_source(),
+                               PIPELINE_ERROR_URL_NOT_FOUND),
                       Invoke(&RunFilterCallback)));
   EXPECT_CALL(*mocks_->data_source(), Stop());