Include tab IDs when reporting data use accounting.

components/data_usage/core/data_use_aggregator_unittest.cc

Index: components/data_usage/core/data_use_aggregator_unittest.cc
diff --git a/components/data_usage/core/data_use_aggregator_unittest.cc b/components/data_usage/core/data_use_aggregator_unittest.cc
index 822a4dbf3636cb171bd97331e319c3cd490bfb8c..5087216ed174eddf60fbe9d3aac20b1479e56f9c 100644
--- a/components/data_usage/core/data_use_aggregator_unittest.cc
+++ b/components/data_usage/core/data_use_aggregator_unittest.cc
@@ -11,6 +11,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/time/time.h"
 #include "components/data_usage/core/data_use.h"
 #include "net/base/load_timing_info.h"
 #include "net/base/network_change_notifier.h"
@@ -25,6 +26,12 @@ namespace data_usage {
 
 namespace {
 
+base::TimeTicks GetRequestStart(const net::URLRequest& request) {
+  net::LoadTimingInfo load_timing_info;
+  request.GetLoadTimingInfo(&load_timing_info);
+  return load_timing_info.request_start;
+}
+
 // Override NetworkChangeNotifier to simulate connection type changes for tests.
 class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
@@ -101,15 +108,18 @@ class ReportingNetworkDelegate : public net::NetworkDelegateImpl {
   void OnNetworkBytesReceived(const net::URLRequest& request,
                               int64_t bytes_received) override {
     DataUseContext data_use_context = UpdateDataUseContext(request);
-    data_use_aggregator_->ReportDataUse(request, data_use_context.tab_id,
-                                        0 /* tx_bytes */, bytes_received);
+    data_use_aggregator_->ReportDataUse(0 /* tx_bytes */, bytes_received,
+                                        request.url(), GetRequestStart(request),
+                                        request.first_party_for_cookies(),
+                                        data_use_context.tab_id);
   }
 
   void OnNetworkBytesSent(const net::URLRequest& request,
                           int64_t bytes_sent) override {
     DataUseContext data_use_context = UpdateDataUseContext(request);
-    data_use_aggregator_->ReportDataUse(request, data_use_context.tab_id,
-                                        bytes_sent, 0 /* rx_bytes */);
+    data_use_aggregator_->ReportDataUse(
+        bytes_sent, 0 /* rx_bytes */, request.url(), GetRequestStart(request),
+        request.first_party_for_cookies(), data_use_context.tab_id);
   }
 
   DataUseAggregator* data_use_aggregator_;
@@ -246,10 +256,7 @@ TEST_F(DataUseAggregatorTest, ReportDataUse) {
   int64_t observed_foo_tx_bytes = 0, observed_foo_rx_bytes = 0;
   while (data_use_it != test_observer()->observed_data_use().end() &&
          data_use_it->url == GURL("http://foo.com")) {
-    net::LoadTimingInfo foo_load_timing_info;
-    foo_request->GetLoadTimingInfo(&foo_load_timing_info);
-
-    EXPECT_EQ(foo_load_timing_info.request_start, data_use_it->request_start);
+    EXPECT_EQ(GetRequestStart(*foo_request), data_use_it->request_start);
     EXPECT_EQ(GURL("http://foofirstparty.com"),
               data_use_it->first_party_for_cookies);
     EXPECT_EQ(kFooTabId, data_use_it->tab_id);
@@ -265,11 +272,8 @@ TEST_F(DataUseAggregatorTest, ReportDataUse) {
   // Then, the |bar_request| data use should have happened.
   int64_t observed_bar_tx_bytes = 0, observed_bar_rx_bytes = 0;
   while (data_use_it != test_observer()->observed_data_use().end()) {
-    net::LoadTimingInfo bar_load_timing_info;
-    bar_request->GetLoadTimingInfo(&bar_load_timing_info);
-
     EXPECT_EQ(GURL("http://bar.com"), data_use_it->url);
-    EXPECT_EQ(bar_load_timing_info.request_start, data_use_it->request_start);
+    EXPECT_EQ(GetRequestStart(*bar_request), data_use_it->request_start);
     EXPECT_EQ(GURL("http://barfirstparty.com"),
               data_use_it->first_party_for_cookies);
     EXPECT_EQ(kBarTabId, data_use_it->tab_id);
@@ -345,9 +349,7 @@ TEST_F(DataUseAggregatorTest, ReportCombinedDataUse) {
   // DataUse element.
   const DataUse& foo_data_use = test_observer()->observed_data_use().front();
   EXPECT_EQ(GURL("http://foo.com"), foo_data_use.url);
-  net::LoadTimingInfo foo_load_timing_info;
-  foo_request->GetLoadTimingInfo(&foo_load_timing_info);
-  EXPECT_EQ(foo_load_timing_info.request_start, foo_data_use.request_start);
+  EXPECT_EQ(GetRequestStart(*foo_request), foo_data_use.request_start);
   EXPECT_EQ(GURL("http://foofirstparty.com"),
             foo_data_use.first_party_for_cookies);
   EXPECT_EQ(kFooTabId, foo_data_use.tab_id);
@@ -359,9 +361,7 @@ TEST_F(DataUseAggregatorTest, ReportCombinedDataUse) {
   // DataUse element.
   const DataUse& bar_data_use = test_observer()->observed_data_use().back();
   EXPECT_EQ(GURL("http://bar.com"), bar_data_use.url);
-  net::LoadTimingInfo bar_load_timing_info;
-  bar_request->GetLoadTimingInfo(&bar_load_timing_info);
-  EXPECT_EQ(bar_load_timing_info.request_start, bar_data_use.request_start);
+  EXPECT_EQ(GetRequestStart(*bar_request), bar_data_use.request_start);
   EXPECT_EQ(GURL("http://barfirstparty.com"),
             bar_data_use.first_party_for_cookies);
   EXPECT_EQ(kBarTabId, bar_data_use.tab_id);