Added and implemented URLRequest::GetTotalSentBytes.

net/url_request/url_request_http_job_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_http_job.h"
 
 #include <stdint.h>
 
 #include <cstddef>
 
@@ skipping 96 matching lines @@
     context_->set_backoff_manager(&manager_);
     context_->Init();
   }
 
   MockClientSocketFactory socket_factory_;
   TestNetworkDelegate network_delegate_;
   URLRequestBackoffManager manager_;
   scoped_ptr<TestURLRequestContext> context_;
 };
 
+const char kSimpleGetMockWrite[] =
+    "GET / HTTP/1.1\r\n"
+    "Host: www.example.com\r\n"
+    "Connection: keep-alive\r\n"
+    "User-Agent:\r\n"
+    "Accept-Encoding: gzip, deflate\r\n"
+    "Accept-Language: en-us,fr\r\n\r\n";
+
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestContentLengthSuccessfulRequest) {
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Length: 12\r\n\r\n"),
                       MockRead("Test Content")};
 
-  StaticSocketDataProvider socket_data(reads, arraysize(reads), nullptr, 0);
+  StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
+                                       arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   request->Start();
   ASSERT_TRUE(request->is_pending());
   base::RunLoop().Run();
 
   EXPECT_TRUE(request->status().is_success());
   EXPECT_EQ(12, request->received_response_content_length());
-  EXPECT_EQ(51, network_delegate_.total_network_bytes_received());
+  EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)),
+            request->GetTotalSentBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            request->GetTotalReceivedBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestContentLengthSuccessfulHttp09Request) {
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("Test Content"),
                       MockRead(net::SYNCHRONOUS, net::OK)};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), nullptr, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   request->Start();
   ASSERT_TRUE(request->is_pending());
   base::RunLoop().Run();
 
   EXPECT_TRUE(request->status().is_success());
   EXPECT_EQ(12, request->received_response_content_length());
-  EXPECT_EQ(12, network_delegate_.total_network_bytes_received());
+  EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)),
+            request->GetTotalSentBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            request->GetTotalReceivedBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            network_delegate_.total_network_bytes_received());
 }
 
-TEST_F(URLRequestHttpJobWithMockSocketsTest, TestContentLengthAbortedRequest) {
+TEST_F(URLRequestHttpJobWithMockSocketsTest, TestContentLengthFailedRequest) {
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Length: 20\r\n\r\n"),
                       MockRead("Test Content"),
                       MockRead(net::SYNCHRONOUS, net::ERR_FAILED)};
 
-  StaticSocketDataProvider socket_data(reads, arraysize(reads), nullptr, 0);
+  StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
+                                       arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   request->Start();
   ASSERT_TRUE(request->is_pending());
   base::RunLoop().Run();
 
   EXPECT_EQ(URLRequestStatus::FAILED, request->status().status());
   EXPECT_EQ(12, request->received_response_content_length());
-  EXPECT_EQ(51, network_delegate_.total_network_bytes_received());
+  EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)),
+            request->GetTotalSentBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            request->GetTotalReceivedBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestContentLengthCancelledRequest) {
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
                                "Content-Length: 20\r\n\r\n"),
                       MockRead("Test Content"),
                       MockRead(net::SYNCHRONOUS, net::ERR_IO_PENDING)};
 
-  StaticSocketDataProvider socket_data(reads, arraysize(reads), nullptr, 0);
+  StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
+                                       arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   delegate.set_cancel_in_received_data(true);
   request->Start();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status());
   EXPECT_EQ(12, request->received_response_content_length());
-  EXPECT_EQ(51, network_delegate_.total_network_bytes_received());
+  EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)),
+            request->GetTotalSentBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            request->GetTotalReceivedBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestNetworkBytesRedirectedRequest) {
-  MockRead redirect_read(
-      "HTTP/1.1 302 Found\r\n"
-      "Location: http://www.example.com\r\n\r\n");
-  StaticSocketDataProvider redirect_socket_data(&redirect_read, 1, nullptr, 0);
+  MockWrite redirect_writes[] = {
+      MockWrite("GET / HTTP/1.1\r\n"
+                "Host: www.redirect.com\r\n"
+                "Connection: keep-alive\r\n"
+                "User-Agent:\r\n"
+                "Accept-Encoding: gzip, deflate\r\n"
+                "Accept-Language: en-us,fr\r\n\r\n")};
+
+  MockRead redirect_reads[] = {
+      MockRead("HTTP/1.1 302 Found\r\n"
+               "Location: http://www.example.com\r\n\r\n"),
+  };
+  StaticSocketDataProvider redirect_socket_data(
+      redirect_reads, arraysize(redirect_reads), redirect_writes,
+      arraysize(redirect_writes));
   socket_factory_.AddSocketDataProvider(&redirect_socket_data);
 
-  MockRead response_reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
-                                        "Content-Length: 12\r\n\r\n"),
-                               MockRead("Test Content")};
-  StaticSocketDataProvider response_socket_data(
-      response_reads, arraysize(response_reads), nullptr, 0);
-  socket_factory_.AddSocketDataProvider(&response_socket_data);
+  MockWrite final_writes[] = {MockWrite(kSimpleGetMockWrite)};
+  MockRead final_reads[] = {MockRead("HTTP/1.1 200 OK\r\n"
+                                     "Content-Length: 12\r\n\r\n"),
+                            MockRead("Test Content")};
+  StaticSocketDataProvider final_socket_data(
+      final_reads, arraysize(final_reads), final_writes,
+      arraysize(final_writes));
+  socket_factory_.AddSocketDataProvider(&final_socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.redirect.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   request->Start();
   ASSERT_TRUE(request->is_pending());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(request->status().is_success());
   EXPECT_EQ(12, request->received_response_content_length());
-  EXPECT_EQ(107, network_delegate_.total_network_bytes_received());
+  // Should not include the redirect.
+  EXPECT_EQ(CountWriteBytes(final_writes, arraysize(final_writes)),
+            request->GetTotalSentBytes());
+  EXPECT_EQ(CountReadBytes(final_reads, arraysize(final_reads)),
+            request->GetTotalReceivedBytes());
+  // Should include the redirect as well as the final response.
+  EXPECT_EQ(CountReadBytes(redirect_reads, arraysize(redirect_reads)) +
+                CountReadBytes(final_reads, arraysize(final_reads)),
+            network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestNetworkBytesCancelledAfterHeaders) {
-  MockRead read("HTTP/1.1 200 OK\r\n\r\n");
-  StaticSocketDataProvider socket_data(&read, 1, nullptr, 0);
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
+  MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n\r\n")};
+  StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
+                                       arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   delegate.set_cancel_in_response_started(true);
   request->Start();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status());
-  EXPECT_EQ(19, network_delegate_.total_network_bytes_received());
+  EXPECT_EQ(0, request->received_response_content_length());
+  EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)),
+            request->GetTotalSentBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            request->GetTotalReceivedBytes());
+  EXPECT_EQ(CountReadBytes(reads, arraysize(reads)),
+            network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestNetworkBytesCancelledImmediately) {
   StaticSocketDataProvider socket_data(nullptr, 0, nullptr, 0);
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate)
           .Pass();
 
   request->Start();
   request->Cancel();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status());
+  EXPECT_EQ(0, request->received_response_content_length());
+  EXPECT_EQ(0, request->GetTotalSentBytes());
+  EXPECT_EQ(0, request->GetTotalReceivedBytes());
   EXPECT_EQ(0, network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest, BackoffHeader) {
-  MockWrite writes[] = {MockWrite(
-      "GET / HTTP/1.1\r\n"
-      "Host: www.example.com\r\n"
-      "Connection: keep-alive\r\n"
-      "User-Agent:\r\n"
-      "Accept-Encoding: gzip, deflate\r\n"
-      "Accept-Language: en-us,fr\r\n\r\n")};
-
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead(
                           "HTTP/1.1 200 OK\r\n"
                           "Backoff: 3600\r\n"
                           "Content-Length: 9\r\n\r\n"),
                       MockRead("test.html")};
 
   net::SSLSocketDataProvider ssl_socket_data_provider(net::ASYNC, net::OK);
   ssl_socket_data_provider.SetNextProto(kProtoHTTP11);
   ssl_socket_data_provider.cert =
       ImportCertFromFile(GetTestCertsDirectory(), "unittest.selfsigned.der");
@@ skipping 26 matching lines @@
   request2->Start();
   ASSERT_TRUE(request2->is_pending());
   base::RunLoop().Run();
 
   EXPECT_FALSE(request2->status().is_success());
   EXPECT_EQ(ERR_TEMPORARY_BACKOFF, request2->status().error());
   EXPECT_EQ(0, delegate2.received_before_network_start_count());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest, BackoffHeaderNotSecure) {
-  MockWrite writes[] = {MockWrite(
-      "GET / HTTP/1.1\r\n"
-      "Host: www.example.com\r\n"
-      "Connection: keep-alive\r\n"
-      "User-Agent:\r\n"
-      "Accept-Encoding: gzip, deflate\r\n"
-      "Accept-Language: en-us,fr\r\n\r\n")};
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead(
                           "HTTP/1.1 200 OK\r\n"
                           "Backoff: 3600\r\n"
                           "Content-Length: 9\r\n\r\n"),
                       MockRead("test.html")};
 
   StaticSocketDataProvider socket_data(reads, arraysize(reads), writes,
                                        arraysize(writes));
   socket_factory_.AddSocketDataProvider(&socket_data);
 
   TestDelegate delegate;
   scoped_ptr<URLRequest> request =
       context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY,
                               &delegate).Pass();
 
   request->Start();
   ASSERT_TRUE(request->is_pending());
   base::RunLoop().Run();
 
   EXPECT_TRUE(request->status().is_success());
   EXPECT_EQ("test.html", delegate.data_received());
   EXPECT_EQ(1, delegate.received_before_network_start_count());
   // Backoff logic does not apply to plain HTTP request.
   EXPECT_EQ(0, manager_.GetNumberOfEntriesForTests());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest, BackoffHeaderCachedResponse) {
-  MockWrite writes[] = {MockWrite(
-      "GET / HTTP/1.1\r\n"
-      "Host: www.example.com\r\n"
-      "Connection: keep-alive\r\n"
-      "User-Agent:\r\n"
-      "Accept-Encoding: gzip, deflate\r\n"
-      "Accept-Language: en-us,fr\r\n\r\n")};
+  MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)};
   MockRead reads[] = {MockRead(
                           "HTTP/1.1 200 OK\r\n"
                           "Backoff: 3600\r\n"
                           "Cache-Control: max-age=120\r\n"
                           "Content-Length: 9\r\n\r\n"),
                       MockRead("test.html")};
 
   net::SSLSocketDataProvider ssl_socket_data_provider(net::ASYNC, net::OK);
   ssl_socket_data_provider.SetNextProto(kProtoHTTP11);
   ssl_socket_data_provider.cert =
@@ skipping 277 matching lines @@
   req_->SetLoadFlags(LOAD_DISABLE_CACHE);
   job->Start();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(URLRequestStatus::IO_PENDING, req_->status().status());
   EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called());
 }
 
 }  // namespace
 
 }  // namespace net