4 files changed, 7 insertions, 7 deletions
diff --git a/webkit/media/simple_data_source.cc b/webkit/media/simple_data_source.cc
index dfdba68..3761148 100644
--- a/webkit/media/simple_data_source.cc
+++ b/webkit/media/simple_data_source.cc
@@ -63,9 +63,9 @@ void SimpleDataSource::Stop(const base::Closure& callback) {
 
 void SimpleDataSource::Initialize(
     const GURL& url,
-    const media::PipelineStatusCB& callback) {
+    const media::PipelineStatusCB& status_cb) {
   DCHECK(MessageLoop::current() == render_loop_);
-  DCHECK(!callback.is_null());
+  DCHECK(!status_cb.is_null());
 
   // Reference to prevent destruction while inside the |initialize_cb_|
   // call. This is a temporary fix to prevent crashes caused by holding the
@@ -75,7 +75,7 @@ void SimpleDataSource::Initialize(
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, UNINITIALIZED);
     state_ = INITIALIZING;
-    initialize_cb_ = callback;
+    initialize_cb_ = status_cb;
 
     // Validate the URL.
     url_ = url;
diff --git a/webkit/media/simple_data_source.h b/webkit/media/simple_data_source.h
index 8662181..b8ca0d4 100644
--- a/webkit/media/simple_data_source.h
+++ b/webkit/media/simple_data_source.h
@@ -86,7 +86,7 @@ class SimpleDataSource
 
   // webkit_glue::WebDataSource implementation.
   virtual void Initialize(const GURL& url,
-                          const media::PipelineStatusCB& callback) OVERRIDE;
+                          const media::PipelineStatusCB& status_cb) OVERRIDE;
   virtual bool HasSingleOrigin() OVERRIDE;
   virtual void Abort() OVERRIDE;
 
diff --git a/webkit/media/simple_data_source_unittest.cc b/webkit/media/simple_data_source_unittest.cc
index e49c489..5d00f13 100644
--- a/webkit/media/simple_data_source_unittest.cc
+++ b/webkit/media/simple_data_source_unittest.cc
@@ -68,7 +68,7 @@ class SimpleDataSourceTest : public testing::Test {
   }
 
   void InitializeDataSource(const char* url,
-                            const media::PipelineStatusCB& callback) {
+                            const media::PipelineStatusCB& status_cb) {
     gurl_ = GURL(url);
 
     url_loader_ = new NiceMock<MockWebURLLoader>();
@@ -80,7 +80,7 @@ class SimpleDataSourceTest : public testing::Test {
     data_source_->set_host(&host_);
     data_source_->SetURLLoaderForTest(url_loader_);
 
-    data_source_->Initialize(gurl_, callback);
+    data_source_->Initialize(gurl_, status_cb);
     MessageLoop::current()->RunAllPending();
   }
 
diff --git a/webkit/media/web_data_source.h b/webkit/media/web_data_source.h
index e2f9b1f..1ed4257 100644
--- a/webkit/media/web_data_source.h
+++ b/webkit/media/web_data_source.h
@@ -25,7 +25,7 @@ class WebDataSource : public media::DataSource {
   //
   // Method called on the render thread.
   virtual void Initialize(const GURL& url,
-                          const media::PipelineStatusCB& callback) = 0;
+                          const media::PipelineStatusCB& status_cb) = 0;
 
   // Returns true if the media resource has a single origin, false otherwise.
   //