Split the data use into foreground, background and unknown

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 <memory>
 #include <utility>
@@ skipping 204 matching lines @@
 // query which is similar to a query of a service, so it should affect
 // DataUse.TrafficSize.System.Dimensions and DataUse.MessageSize.ServiceName
 // histograms. AppState and ConnectionType dimensions are always Foreground and
 // NotCellular respectively.
 TEST_F(ChromeNetworkDelegateTest, DataUseMeasurementServiceTest) {
   Initialize();
   base::HistogramTester histogram_tester;
 
   // A query from a service without redirection.
   RequestURL(context(), socket_factory(), false, false);
-  histogram_tester.ExpectTotalCount(
-      "DataUse.TrafficSize.System.Downstream.Foreground.NotCellular", 1);
+  EXPECT_FALSE(
+      histogram_tester
+          .GetTotalCountsForPrefix(
+              "DataUse.TrafficSize.System.Downstream.Foreground.NotCellular")
+          .empty());

[mmenke, 2016/10/06 20:53:49]

Why are you no longer testing exact counts?

[Raj, 2016/10/06 21:02:14]

Because this CL changes the UMA to log on every network TX/RX of the URLRequest.
Earlier it was logged only when URLRequest completes.

[mmenke, 2016/10/06 21:07:35]

Mention that in CL description?

   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.System.Upstream.Foreground.NotCellular", 1);
-  // One upload and one download message, so totalCount should be 2.
-  histogram_tester.ExpectTotalCount("DataUse.MessageSize.Suggestions", 2);
+  EXPECT_FALSE(histogram_tester
+                   .GetTotalCountsForPrefix("DataUse.MessageSize.Suggestions")
+                   .empty());
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.User.Downstream.Foreground.NotCellular", 0);
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.User.Upstream.Foreground.NotCellular", 0);
 }
 
 // This function tests data use measurement for requests by user.The query from
 // a user should affect DataUse.TrafficSize.User.Dimensions histogram. AppState
 // and ConnectionType dimensions are always Foreground and NotCellular
 // respectively.
 TEST_F(ChromeNetworkDelegateTest, DataUseMeasurementUserTest) {
   Initialize();
   base::HistogramTester histogram_tester;
 
   // A query from user without redirection.
   RequestURL(context(), socket_factory(), true, false);
-  histogram_tester.ExpectTotalCount(
-      "DataUse.TrafficSize.User.Downstream.Foreground.NotCellular", 1);
+  EXPECT_FALSE(
+      histogram_tester
+          .GetTotalCountsForPrefix(
+              "DataUse.TrafficSize.User.Downstream.Foreground.NotCellular")
+          .empty());
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.User.Upstream.Foreground.NotCellular", 1);
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.System.Downstream.Foreground.NotCellular", 0);
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.System.Upstream.Foreground.NotCellular", 0);
   histogram_tester.ExpectTotalCount("DataUse.MessageSize.Suggestions", 0);
 }
 
 // This function tests data use measurement for requests by services in case the
 // request is redirected once. it makes a query which is similar to a query of a
 // service, so it should affect DataUse.TrafficSize.System.Dimensions and
 // DataUse.MessageSize.ServiceName histograms. AppState and ConnectionType
 // dimensions are always Foreground and NotCellular respectively.
 TEST_F(ChromeNetworkDelegateTest, DataUseMeasurementServiceTestWithRedirect) {
   Initialize();
   base::HistogramTester histogram_tester;
 
   // A query from user with one redirection.
   RequestURL(context(), socket_factory(), false, true);
-  histogram_tester.ExpectTotalCount(
-      "DataUse.TrafficSize.System.Downstream.Foreground.NotCellular", 2);
+  EXPECT_FALSE(
+      histogram_tester
+          .GetTotalCountsForPrefix(
+              "DataUse.TrafficSize.System.Downstream.Foreground.NotCellular")
+          .empty());
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.System.Upstream.Foreground.NotCellular", 2);
   // Two uploads and two downloads message, so totalCount should be 4.
-  histogram_tester.ExpectTotalCount("DataUse.MessageSize.Suggestions", 4);
+  EXPECT_FALSE(histogram_tester
+                   .GetTotalCountsForPrefix("DataUse.MessageSize.Suggestions")
+                   .empty());
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.User.Downstream.Foreground.NotCellular", 0);
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.User.Upstream.Foreground.NotCellular", 0);
 }
 
 // This function tests data use measurement for requests by user in case the
 // request is redirected once.The query from a user should affect
 // DataUse.TrafficSize.User.Dimensions histogram. AppState and ConnectionType
 // dimensions are always Foreground and NotCellular respectively.
 TEST_F(ChromeNetworkDelegateTest, DataUseMeasurementUserTestWithRedirect) {
   Initialize();
   base::HistogramTester histogram_tester;
 
   // A query from user with one redirection.
   RequestURL(context(), socket_factory(), true, true);
 
-  histogram_tester.ExpectTotalCount(
-      "DataUse.TrafficSize.User.Downstream.Foreground.NotCellular", 2);
+  EXPECT_FALSE(
+      histogram_tester
+          .GetTotalCountsForPrefix(
+              "DataUse.TrafficSize.User.Downstream.Foreground.NotCellular")
+          .empty());
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.User.Upstream.Foreground.NotCellular", 2);
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.System.Downstream.Foreground.NotCellular", 0);
   histogram_tester.ExpectTotalCount(
       "DataUse.TrafficSize.System.Upstream.Foreground.NotCellular", 0);
   histogram_tester.ExpectTotalCount("DataUse.MessageSize.Suggestions", 0);
 }
 
 TEST_F(ChromeNetworkDelegateTest, DisableSameSiteCookiesIffFlagDisabled) {
@@ skipping 336 matching lines @@
 
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 
   cookie_settings_->SetCookieSetting(kBlockedFirstPartySite,
                                      CONTENT_SETTING_BLOCK);
   // Privacy mode is disabled as kAllowedSite is still getting cookies
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 }