WebKit roll 83160:83167.

TBR=tkent

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

3 files changed, 5 insertions, 21 deletions

diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/glue/media/buffered_resource_loader.cc
index d88c654..8cca6f8 100644
--- a/webkit/glue/media/buffered_resource_loader.cc
+++ b/webkit/glue/media/buffered_resource_loader.cc
@@ -318,18 +318,9 @@ void BufferedResourceLoader::didReceiveResponse(
   DoneStart(net::OK);
 }
 
-// FIXME(vsevik): remove once removed in webkit
 void BufferedResourceLoader::didReceiveData(
     WebURLLoader* loader,
     const char* data,
-    int data_length) {
-  didReceiveData2(loader, data, data_length, -1);
-}
-
-// FIXME(vsevik): rename once renamed in webkit
-void BufferedResourceLoader::didReceiveData2(
-    WebURLLoader* loader,
-    const char* data,
     int data_length,
     int length_received) {
   DCHECK(!completed_);
diff --git a/webkit/glue/media/buffered_resource_loader.h b/webkit/glue/media/buffered_resource_loader.h
index 22b8bd1..06b0590 100644
--- a/webkit/glue/media/buffered_resource_loader.h
+++ b/webkit/glue/media/buffered_resource_loader.h
@@ -131,18 +131,11 @@ class BufferedResourceLoader :
   virtual void didDownloadData(
       WebKit::WebURLLoader* loader,
       int data_length);
-  // FIXME(vsevik): rename once renamed in webkit
-  virtual void didReceiveData2(
+  virtual void didReceiveData(
       WebKit::WebURLLoader* loader,
       const char* data,
       int data_length,
       int length_received);
-
-  // FIXME(vsevik): remove once removed in webkit
-  virtual void didReceiveData(
-      WebKit::WebURLLoader* loader,
-      const char* data,
-      int dataLength);
   virtual void didReceiveCachedMetadata(
       WebKit::WebURLLoader* loader,
       const char* data, int dataLength);
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc
index b30ce82..97cd3c1 100644
--- a/webkit/glue/media/buffered_resource_loader_unittest.cc
+++ b/webkit/glue/media/buffered_resource_loader_unittest.cc
@@ -159,10 +159,10 @@ class BufferedResourceLoaderTest : public testing::Test {
   void WriteLoader(int position, int size) {
     EXPECT_CALL(*this, NetworkCallback())
         .RetiresOnSaturation();
-    // FIXME(vsevik): rename once renamed in webkit
-    loader_->didReceiveData2(url_loader_,
-                             reinterpret_cast<char*>(data_ + position), size,
-                             size);
+    loader_->didReceiveData(url_loader_,
+                            reinterpret_cast<char*>(data_ + position),
+                            size,
+                            size);
   }
 
   // Helper method to read from |loader_|.