Include tab IDs when reporting data use accounting.

components/data_usage/core/data_use.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_DATA_USAGE_CORE_DATA_USE_H_
 #define COMPONENTS_DATA_USAGE_CORE_DATA_USE_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/time/time.h"
 #include "net/base/network_change_notifier.h"
 #include "url/gurl.h"
 
 namespace data_usage {
 
 struct DataUse {
   DataUse(const GURL& url,
           const base::TimeTicks& request_start,
           const GURL& first_party_for_cookies,
           int32_t tab_id,
           net::NetworkChangeNotifier::ConnectionType connection_type,
           const std::string& mcc_mnc,
           int64_t tx_bytes,
           int64_t rx_bytes);
 
   ~DataUse();
 
+  bool operator==(const DataUse& other) const;

[bengr, 2015/11/05 00:00:38]

One of your tests had a method to check if two DataUse objects were equal, but
didn't use this operator.

[sclittle, 2015/11/05 01:22:48]

I think you mean the ExpectDataUse function in tab_id_annotator_unittest.cc,
which does actually use the "==" operator. It calls EXPECT_EQ(*expected,
*actual).

+
   // Returns true if |this| and |other| are identical except for byte counts.
   bool CanCombineWith(const DataUse& other) const;
 
   GURL url;
   // The TimeTicks when the request that is associated with these bytes was
   // started.
   base::TimeTicks request_start;
   GURL first_party_for_cookies;
   int32_t tab_id;
   net::NetworkChangeNotifier::ConnectionType connection_type;
   // MCC+MNC (mobile country code + mobile network code) of the provider of the
   // SIM when the network traffic was exchanged. Set to empty string if SIM is
   // not present. |mcc_mnc| is set even if data was not exchanged on the
   // cellular network. For dual SIM phones, this is set to the MCC/MNC of the
   // SIM in slot 0.
   std::string mcc_mnc;
 
   int64_t tx_bytes;
   int64_t rx_bytes;
 };
 
 }  // namespace data_usage
 
 #endif  // COMPONENTS_DATA_USAGE_CORE_DATA_USE_H_