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 117 matching lines @@
       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(137, request->GetTotalSentBytes());
+  EXPECT_EQ(51, request->GetTotalReceivedBytes());

[mmenke, 2015/09/04 15:21:49]

Can't we just calculate the received bytes from the mock reads.  We should also
add write expectations, and test those as well - seems more robust.

[sclittle, 2015/09/04 22:03:10]

Done.

   EXPECT_EQ(51, network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestContentLengthSuccessfulHttp09Request) {
   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(137, request->GetTotalSentBytes());
+  EXPECT_EQ(12, request->GetTotalReceivedBytes());
   EXPECT_EQ(12, network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest, TestContentLengthAbortedRequest) {
   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);
   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(137, request->GetTotalSentBytes());
+  EXPECT_EQ(51, request->GetTotalReceivedBytes());
   EXPECT_EQ(51, network_delegate_.total_network_bytes_received());
 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestContentLengthCancelledRequest) {
   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);
   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(137, request->GetTotalSentBytes());
+  EXPECT_EQ(51, request->GetTotalReceivedBytes());
   EXPECT_EQ(51, 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);
   socket_factory_.AddSocketDataProvider(&redirect_socket_data);
@@ skipping 10 matching lines @@
       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(137, request->GetTotalSentBytes());
+  EXPECT_EQ(51, request->GetTotalReceivedBytes());

[mmenke, 2015/09/04 15:21:49]

Think these are worth a comment (Basically the opposite of the next comment -
should not include the redirect)

[sclittle, 2015/09/04 22:03:10]

Done.

+  // Should include the redirect as well as the final response.
   EXPECT_EQ(107, network_delegate_.total_network_bytes_received());

[mmenke, 2015/09/04 15:21:49]

We should do the same for bytes sent, to make sure the redirect is handled
properly.

[sclittle, 2015/09/04 22:03:10]

Yeah, that will come later in a separate CL when I add and implement
NetworkDelegate::OnNetworkBytesSent.

 }
 
 TEST_F(URLRequestHttpJobWithMockSocketsTest,
        TestNetworkBytesCancelledAfterHeaders) {
   MockRead read("HTTP/1.1 200 OK\r\n\r\n");
   StaticSocketDataProvider socket_data(&read, 1, nullptr, 0);
   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(0, request->received_response_content_length());
+  EXPECT_EQ(137, request->GetTotalSentBytes());
+  EXPECT_EQ(19, request->GetTotalReceivedBytes());
   EXPECT_EQ(19, 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"
@@ skipping 376 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