Add transfer size paramater to didFinishLoading [2/3]

Mini DD:
https://docs.google.com/a/chromium.org/document/d/1kAKnBKofLc3Tex_JPveubwJcQLT3BhIL3xNQyjvRIps/edit?usp=sharing

Most of files contain only signature changes.

There are 3 non-trivial changes:
1) ResourceMsg_RequestComplete IPC message receives struct instead of distinct parameters.
2) Use URLRequest::GetTotalReceivedBytes instead of  DevToolsNetLogObserver::GetAndResetEncodedDataLength
3) Remove unused code in DevToolsNetLogObserver.


BUG=111052

Review URL: https://codereview.chromium.org/143263002

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

17 files changed, 39 insertions, 22 deletions

diff --git a/content/renderer/fetchers/resource_fetcher_impl.cc b/content/renderer/fetchers/resource_fetcher_impl.cc
index e5678a8..6462e76 100644
--- a/content/renderer/fetchers/resource_fetcher_impl.cc
+++ b/content/renderer/fetchers/resource_fetcher_impl.cc
@@ -164,7 +164,8 @@ void ResourceFetcherImpl::didReceiveCachedMetadata(
 }
 
 void ResourceFetcherImpl::didFinishLoading(
-    WebURLLoader* loader, double finishTime) {
+    WebURLLoader* loader, double finishTime,
+    int64_t total_encoded_data_length) {
   DCHECK(!completed_);
 
   RunCallback(response_, data_);
diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h
index 5ae09e2..aed1d79 100644
--- a/content/renderer/fetchers/resource_fetcher_impl.h
+++ b/content/renderer/fetchers/resource_fetcher_impl.h
@@ -70,7 +70,8 @@ class ResourceFetcherImpl : public ResourceFetcher,
       blink::WebURLLoader* loader, const char* data, int data_length,
       int encoded_data_length);
   virtual void didFinishLoading(
-      blink::WebURLLoader* loader, double finishTime);
+      blink::WebURLLoader* loader, double finishTime,
+      int64_t total_encoded_data_length);
   virtual void didFail(
       blink::WebURLLoader* loader, const blink::WebURLError& error);
 
diff --git a/content/renderer/media/android/media_info_loader.cc b/content/renderer/media/android/media_info_loader.cc
index 875265c..8a49e04 100644
--- a/content/renderer/media/android/media_info_loader.cc
+++ b/content/renderer/media/android/media_info_loader.cc
@@ -147,7 +147,8 @@ void MediaInfoLoader::didReceiveCachedMetadata(
 
 void MediaInfoLoader::didFinishLoading(
     WebURLLoader* loader,
-    double finishTime) {
+    double finishTime,
+    int64_t total_encoded_data_length) {
   DCHECK(active_loader_.get());
   DidBecomeReady(kOk);
 }
diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h
index 8e67c80..68e5232 100644
--- a/content/renderer/media/android/media_info_loader.h
+++ b/content/renderer/media/android/media_info_loader.h
@@ -95,7 +95,8 @@ class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient {
       const char* data, int dataLength);
   virtual void didFinishLoading(
       blink::WebURLLoader* loader,
-      double finishTime);
+      double finishTime,
+      int64_t total_encoded_data_length);
   virtual void didFail(
       blink::WebURLLoader* loader,
       const blink::WebURLError&);
diff --git a/content/renderer/media/buffered_data_source_unittest.cc b/content/renderer/media/buffered_data_source_unittest.cc
index e486907..df4aae8 100644
--- a/content/renderer/media/buffered_data_source_unittest.cc
+++ b/content/renderer/media/buffered_data_source_unittest.cc
@@ -175,7 +175,7 @@ class BufferedDataSourceTest : public testing::Test {
 
   void FinishLoading() {
     data_source_->set_loading(false);
-    loader()->didFinishLoading(url_loader(), 0);
+    loader()->didFinishLoading(url_loader(), 0, -1);
     message_loop_.RunUntilIdle();
   }
 
diff --git a/content/renderer/media/buffered_resource_loader.cc b/content/renderer/media/buffered_resource_loader.cc
index b050feb..3177209 100644
--- a/content/renderer/media/buffered_resource_loader.cc
+++ b/content/renderer/media/buffered_resource_loader.cc
@@ -483,7 +483,8 @@ void BufferedResourceLoader::didReceiveCachedMetadata(
 
 void BufferedResourceLoader::didFinishLoading(
     WebURLLoader* loader,
-    double finishTime) {
+    double finishTime,
+    int64_t total_encoded_data_length) {
   DVLOG(1) << "didFinishLoading";
   DCHECK(active_loader_.get());
 
diff --git a/content/renderer/media/buffered_resource_loader.h b/content/renderer/media/buffered_resource_loader.h
index 3331979..ee4759d 100644
--- a/content/renderer/media/buffered_resource_loader.h
+++ b/content/renderer/media/buffered_resource_loader.h
@@ -164,7 +164,8 @@ class CONTENT_EXPORT BufferedResourceLoader
       const char* data, int dataLength);
   virtual void didFinishLoading(
       blink::WebURLLoader* loader,
-      double finishTime);
+      double finishTime,
+      int64_t total_encoded_data_length);
   virtual void didFail(
       blink::WebURLLoader* loader,
       const blink::WebURLError&);
diff --git a/content/renderer/media/buffered_resource_loader_unittest.cc b/content/renderer/media/buffered_resource_loader_unittest.cc
index a18422f..94022f6 100644
--- a/content/renderer/media/buffered_resource_loader_unittest.cc
+++ b/content/renderer/media/buffered_resource_loader_unittest.cc
@@ -425,7 +425,7 @@ TEST_F(BufferedResourceLoaderTest, BufferAndRead) {
 
   // Response has completed.
   EXPECT_CALL(*this, LoadingCallback(BufferedResourceLoader::kLoadingFinished));
-  loader_->didFinishLoading(url_loader_, 0);
+  loader_->didFinishLoading(url_loader_, 0, -1);
 
   // Try to read 10 from position 25 will just return with 5 bytes.
   EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 5));
@@ -518,7 +518,7 @@ TEST_F(BufferedResourceLoaderTest, ReadOutsideBuffer) {
 
   EXPECT_CALL(*this, LoadingCallback(BufferedResourceLoader::kLoadingFinished));
   EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 5));
-  loader_->didFinishLoading(url_loader_, 0);
+  loader_->didFinishLoading(url_loader_, 0, -1);
 }
 
 TEST_F(BufferedResourceLoaderTest, RequestFailedWhenRead) {
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
index 4027802..7df9ea4 100644
--- a/content/renderer/npapi/webplugin_impl.cc
+++ b/content/renderer/npapi/webplugin_impl.cc
@@ -132,7 +132,9 @@ class MultiPartResponseClient : public WebURLLoaderClient {
     byte_range_lower_bound_ += data_length;
   }
 
-  virtual void didFinishLoading(WebURLLoader*, double finishTime) {}
+  virtual void didFinishLoading(WebURLLoader*,
+                                double finishTime,
+                                int64_t total_encoded_data_length) {}
   virtual void didFail(WebURLLoader*, const WebURLError&) {}
 
  private:
@@ -510,7 +512,8 @@ void WebPluginImpl::LoaderClient::didReceiveCachedMetadata(
 }
 
 void WebPluginImpl::LoaderClient::didFinishLoading(
-    blink::WebURLLoader* loader, double finishTime) {
+    blink::WebURLLoader* loader, double finishTime,
+    int64_t total_encoded_data_length) {
   parent_->didFinishLoading(loader, finishTime);
 }
 
diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h
index ef7b8ea..b8b59d5 100644
--- a/content/renderer/npapi/webplugin_impl.h
+++ b/content/renderer/npapi/webplugin_impl.h
@@ -353,7 +353,8 @@ class WebPluginImpl : public WebPlugin,
                                           const char* data,
                                           int dataLength) OVERRIDE;
     virtual void didFinishLoading(blink::WebURLLoader*,
-                                  double finishTime) OVERRIDE;
+                                  double finishTime,
+                                  int64_t total_encoded_data_length) OVERRIDE;
     virtual void didFail(blink::WebURLLoader*,
                          const blink::WebURLError&) OVERRIDE;
 
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 5600663..1be8152 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -133,8 +133,9 @@ void P2PPortAllocatorSession::didReceiveData(
   relay_session_response_.append(data, data + data_length);
 }
 
-void P2PPortAllocatorSession::didFinishLoading(WebURLLoader* loader,
-                                               double finish_time) {
+void P2PPortAllocatorSession::didFinishLoading(
+    WebURLLoader* loader, double finish_time,
+    int64_t total_encoded_data_length) {
   ParseRelayResponse();
 }
 
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index edb3403..8ff20a5 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -94,7 +94,8 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession,
                               int data_length,
                               int encoded_data_length) OVERRIDE;
   virtual void didFinishLoading(blink::WebURLLoader* loader,
-                                double finish_time) OVERRIDE;
+                                double finish_time,
+                                int64_t total_encoded_data_length) OVERRIDE;
   virtual void didFail(blink::WebURLLoader* loader,
                        const blink::WebURLError& error) OVERRIDE;
 
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index b54b4d4..dadddf9 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -428,8 +428,8 @@ void PepperPluginInstanceImpl::ExternalDocumentLoader::ReplayReceivedData(
                                     0 /* encoded_data_length */);
   }
   if (finished_loading_) {
-    document_loader->didFinishLoading(NULL,
-                                      0 /* finish_time */);
+    document_loader->didFinishLoading(NULL, 0 /* finish_time */,
+        blink::WebURLLoaderClient::kUnknownEncodedDataLength);
   }
   if (error_.get()) {
     document_loader->didFail(NULL, *error_);
@@ -446,7 +446,8 @@ void PepperPluginInstanceImpl::ExternalDocumentLoader::didReceiveData(
 
 void PepperPluginInstanceImpl::ExternalDocumentLoader::didFinishLoading(
     WebURLLoader* loader,
-    double finish_time) {
+    double finish_time,
+    int64_t total_encoded_data_length) {
   DCHECK(!finished_loading_);
   finished_loading_ = true;
 }
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h
index 62c6614..cc5b98f 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.h
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -538,7 +538,8 @@ class CONTENT_EXPORT PepperPluginInstanceImpl
                                 int data_length,
                                 int encoded_data_length);
     virtual void didFinishLoading(blink::WebURLLoader* loader,
-                                  double finish_time);
+                                  double finish_time,
+                                  int64_t total_encoded_data_length);
     virtual void didFail(blink::WebURLLoader* loader,
                          const blink::WebURLError& error);
 
diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc
index 178548e..e6a2b5c 100644
--- a/content/renderer/pepper/pepper_url_loader_host.cc
+++ b/content/renderer/pepper/pepper_url_loader_host.cc
@@ -173,7 +173,8 @@ void PepperURLLoaderHost::didReceiveData(WebURLLoader* loader,
 }
 
 void PepperURLLoaderHost::didFinishLoading(WebURLLoader* loader,
-                                           double finish_time) {
+                                           double finish_time,
+                                           int64_t total_encoded_data_length) {
   // Note that |loader| will be NULL for document loads.
   SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_FinishedLoading(PP_OK));
 }
diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h
index 2790c78..d352536 100644
--- a/content/renderer/pepper/pepper_url_loader_host.h
+++ b/content/renderer/pepper/pepper_url_loader_host.h
@@ -59,7 +59,8 @@ class PepperURLLoaderHost
                               int data_length,
                               int encoded_data_length);
   virtual void didFinishLoading(blink::WebURLLoader* loader,
-                                double finish_time);
+                                double finish_time,
+                                int64_t total_encoded_data_length);
   virtual void didFail(blink::WebURLLoader* loader,
                        const blink::WebURLError& error);
 
diff --git a/content/renderer/pepper/pepper_webplugin_impl.cc b/content/renderer/pepper/pepper_webplugin_impl.cc
index 8947d73..1cd2850 100644
--- a/content/renderer/pepper/pepper_webplugin_impl.cc
+++ b/content/renderer/pepper/pepper_webplugin_impl.cc
@@ -211,7 +211,8 @@ void PepperWebPluginImpl::didReceiveData(const char* data, int data_length) {
 void PepperWebPluginImpl::didFinishLoading() {
   blink::WebURLLoaderClient* document_loader = instance_->document_loader();
   if (document_loader)
-    document_loader->didFinishLoading(NULL, 0.0);
+    document_loader->didFinishLoading(NULL, 0.0,
+        blink::WebURLLoaderClient::kUnknownEncodedDataLength);
 }
 
 void PepperWebPluginImpl::didFailLoading(const blink::WebURLError& error) {