Include tab IDs when reporting data use accounting.

chrome/browser/net/chrome_network_delegate_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ skipping 87 matching lines @@
 // respective methods have been called.
 class FakeDataUseAggregator : public data_usage::DataUseAggregator {
  public:
   FakeDataUseAggregator()
       : on_the_record_tx_bytes_(0),
         on_the_record_rx_bytes_(0),
         off_the_record_tx_bytes_(0),
         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,

[tbansal1, 2015/10/26 22:24:29]

Why not keep the request object? Makes it easier if we need to pull something
else out of request.

[sclittle, 2015/10/26 23:56:01]

You're right, but the request might no longer exist after the hop to the UI
thread, so we have to pull everything we need out of it before that hop.

+                     int64_t rx_bytes,
+                     const GURL& url,
+                     const base::Time& 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;
   }
 
   void ReportOffTheRecordDataUse(int64_t tx_bytes, int64_t rx_bytes) override {
     off_the_record_tx_bytes_ += tx_bytes;
     off_the_record_rx_bytes_ += rx_bytes;
   }
 
   int64_t on_the_record_tx_bytes() const { return on_the_record_tx_bytes_; }
@@ skipping 408 matching lines @@
                                                        kBlockedFirstPartySite));
 
   cookie_settings_->SetCookieSetting(
       ContentSettingsPattern::FromURL(kBlockedFirstPartySite),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTING_BLOCK);
   // Privacy mode is disabled as kAllowedSite is still getting cookies
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 }