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"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_member.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/net/safe_search_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/data_usage/core/data_use_aggregator.h"
+#include "components/data_usage/core/data_use_annotator.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/resource_type.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/request_priority.h"
 #include "net/socket/socket_test_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 56 matching lines @@
   request->Start();
   base::RunLoop().RunUntilIdle();
   return request.Pass();
 }
 
 // A fake DataUseAggregator for testing that only counts how many times its
 // respective methods have been called.
 class FakeDataUseAggregator : public data_usage::DataUseAggregator {
  public:
   FakeDataUseAggregator()
-      : on_the_record_tx_bytes_(0),
+      : data_usage::DataUseAggregator(
+            scoped_ptr<data_usage::DataUseAnnotator>()),
+        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,
+  void ReportDataUse(net::URLRequest* request,
                      int64_t tx_bytes,
                      int64_t rx_bytes) 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;
   }
@@ skipping 410 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));
 }