WebKit roll 83160:83167.

TBR=tkent

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

9 files changed, 16 insertions, 55 deletions

diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc
index 20be2b8..33a3f8c 100644
--- a/webkit/glue/ftp_directory_listing_response_delegate.cc
+++ b/webkit/glue/ftp_directory_listing_response_delegate.cc
@@ -110,7 +110,7 @@ void FtpDirectoryListingResponseDelegate::Init(const GURL& response_url) {
 
 void FtpDirectoryListingResponseDelegate::SendDataToClient(
     const std::string& data) {
-  client_->didReceiveData2(loader_, data.data(), data.length(), -1);
+  client_->didReceiveData(loader_, data.data(), data.length(), -1);
 }
 
 }  // namespace webkit_glue
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_|.
diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc
index a32520e..53cdc3f 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/glue/multipart_response_delegate.cc
@@ -138,10 +138,10 @@ void MultipartResponseDelegate::OnReceivedData(const char* data,
       }
       if (data_length > 0) {
         // Send the last data chunk.
-        // FIXME(vsevik): rename once renamed in webkit
-        client_->didReceiveData2(loader_,
-                                 data_.data(),
-                                 static_cast<int>(data_length), -1);
+        client_->didReceiveData(loader_,
+                                data_.data(),
+                                static_cast<int>(data_length),
+                                -1);
       }
     }
     size_t boundary_end_pos = boundary_pos + boundary_.length();
@@ -171,9 +171,8 @@ void MultipartResponseDelegate::OnReceivedData(const char* data,
     int send_length = data_.length() - boundary_.length();
     if (data_[data_.length() - 1] == '\n')
       send_length = data_.length();
-    // FIXME(vsevik): rename didReceiveData2 once renamed in webkit
     if (client_)
-      client_->didReceiveData2(loader_, data_.data(), send_length, -1);
+      client_->didReceiveData(loader_, data_.data(), send_length, -1);
     data_ = data_.substr(send_length);
   }
 }
@@ -182,10 +181,9 @@ void MultipartResponseDelegate::OnCompletedRequest() {
   // If we have any pending data and we're not in a header, go ahead and send
   // it to WebCore.
   if (!processing_headers_ && !data_.empty() && !stop_sending_ && client_) {
-    // FIXME(vsevik): rename didReceiveData2 once renamed in webkit
-    client_->didReceiveData2(loader_,
-                             data_.data(),
-                             static_cast<int>(data_.length()), -1);
+    client_->didReceiveData(loader_,
+                            data_.data(),
+                            static_cast<int>(data_.length()), -1);
   }
 }
 
diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/glue/multipart_response_delegate_unittest.cc
index c48c2de..b0fb6e6 100644
--- a/webkit/glue/multipart_response_delegate_unittest.cc
+++ b/webkit/glue/multipart_response_delegate_unittest.cc
@@ -66,8 +66,7 @@ class MockWebURLLoaderClient : public WebURLLoaderClient {
     response_ = response;
     data_.clear();
   }
-  // FIXME(vsevik): rename once renamed in webkit
-  virtual void didReceiveData2(
+  virtual void didReceiveData(
       WebKit::WebURLLoader* loader,
       const char* data,
       int data_length,
@@ -75,14 +74,6 @@ class MockWebURLLoaderClient : public WebURLLoaderClient {
     ++received_data_;
     data_.append(data, data_length);
   }
-
-  // FIXME(vsevik): remove once removed in webkit
-  virtual void didReceiveData(
-      WebKit::WebURLLoader* loader,
-      const char* data,
-      int data_length) {
-    didReceiveData2(loader, data, data_length, -1);
-  }
   virtual void didFinishLoading(WebURLLoader*, double finishTime) {}
   virtual void didFail(WebURLLoader*, const WebURLError&) {}
 
diff --git a/webkit/glue/resource_fetcher.cc b/webkit/glue/resource_fetcher.cc
index b0ee667..f7907fb 100644
--- a/webkit/glue/resource_fetcher.cc
+++ b/webkit/glue/resource_fetcher.cc
@@ -84,14 +84,7 @@ void ResourceFetcher::didReceiveResponse(
   response_ = response;
 }
 
-// FIXME(vsevik): remove once removed in webkit
 void ResourceFetcher::didReceiveData(
-    WebURLLoader* loader, const char* data, int data_length) {
-  didReceiveData2(loader, data, data_length, -1);
-}
-
-// FIXME(vsevik): rename once renamed in webkit
-void ResourceFetcher::didReceiveData2(
     WebURLLoader* loader, const char* data, int data_length,
     int length_received) {
   DCHECK(!completed_);
diff --git a/webkit/glue/resource_fetcher.h b/webkit/glue/resource_fetcher.h
index 726e279..d9b3460 100644
--- a/webkit/glue/resource_fetcher.h
+++ b/webkit/glue/resource_fetcher.h
@@ -64,11 +64,7 @@ class ResourceFetcher : public WebKit::WebURLLoaderClient {
   virtual void didReceiveCachedMetadata(
       WebKit::WebURLLoader* loader, const char* data, int data_length);
 
-  // FIXME(vsevik): remove once removed in webkit
   virtual void didReceiveData(
-      WebKit::WebURLLoader* loader, const char* data, int data_length);
-  // FIXME(vsevik): rename once renamed in webkit
-  virtual void didReceiveData2(
       WebKit::WebURLLoader* loader, const char* data, int data_length,
       int length_received);
   virtual void didFinishLoading(
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 793ca83..2c0659a 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -607,8 +607,7 @@ void WebURLLoaderImpl::Context::OnReceivedData(const char* data, int len) {
     // client_->didReceiveData and client_->didReceiveResponse.
     multipart_delegate_->OnReceivedData(data, len);
   } else {
-    // FIXME(vsevik): rename once renamed in webkit
-    client_->didReceiveData2(loader_, data, len, -1);
+    client_->didReceiveData(loader_, data, len, -1);
   }
 }