Include tab IDs when reporting data use accounting.

chrome/browser/net/chrome_network_delegate_unittest.cc

Index: chrome/browser/net/chrome_network_delegate_unittest.cc
diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc
index c29e462bf502532e22b5f5fd5ed59ed9c967f79e..bb3d5e961719a1874ebdf8e5a4b6eff1832cf85a 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -105,10 +105,12 @@ class FakeDataUseAggregator : public data_usage::DataUseAggregator {
         off_the_record_rx_bytes_(0) {}
   ~FakeDataUseAggregator() override {}
 
-  void ReportDataUse(const net::URLRequest& request,
-                     int32_t tab_id,
-                     int64_t tx_bytes,
-                     int64_t rx_bytes) override {
+  void ReportDataUse(int64_t tx_bytes,
+                     int64_t rx_bytes,
+                     const GURL& url,
+                     const base::TimeTicks& request_time,
+                     const GURL& first_party_for_cookies,
+                     int32_t tab_id) override {
     on_the_record_tx_bytes_ += tx_bytes;
     on_the_record_rx_bytes_ += rx_bytes;
   }
@@ -292,7 +294,7 @@ TEST_F(ChromeNetworkDelegateTest, EnableFirstPartyOnlyCookiesIffFlagEnabled) {
   EXPECT_TRUE(network_delegate()->AreExperimentalCookieFeaturesEnabled());
 }
 
-TEST_F(ChromeNetworkDelegateTest, ReportDataUseToAggregator) {
+TEST_F(ChromeNetworkDelegateTest, ReportUserDataUseToAggregator) {
   FakeDataUseAggregator fake_aggregator;
   Initialize();
 
@@ -300,7 +302,24 @@ TEST_F(ChromeNetworkDelegateTest, ReportDataUseToAggregator) {
       &fake_aggregator, false /* is_data_usage_off_the_record */);
 
   scoped_ptr<net::URLRequest> request =
-      RequestURL(context(), socket_factory(), true, false);
+      RequestURL(context(), socket_factory(), true /* from_user */, false);
+  EXPECT_EQ(request->GetTotalSentBytes(),
+            fake_aggregator.on_the_record_tx_bytes());
+  EXPECT_EQ(request->GetTotalReceivedBytes(),
+            fake_aggregator.on_the_record_rx_bytes());
+  EXPECT_EQ(0, fake_aggregator.off_the_record_tx_bytes());
+  EXPECT_EQ(0, fake_aggregator.off_the_record_rx_bytes());
+}
+
+TEST_F(ChromeNetworkDelegateTest, ReportNonUserDataUseToAggregator) {
+  FakeDataUseAggregator fake_aggregator;
+  Initialize();
+
+  chrome_network_delegate()->set_data_use_aggregator(
+      &fake_aggregator, false /* is_data_usage_off_the_record */);
+
+  scoped_ptr<net::URLRequest> request =
+      RequestURL(context(), socket_factory(), false /* from_user */, false);
   EXPECT_EQ(request->GetTotalSentBytes(),
             fake_aggregator.on_the_record_tx_bytes());
   EXPECT_EQ(request->GetTotalReceivedBytes(),