Split the data use into foreground, background and unknown

components/data_use_measurement/content/data_use_measurement.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_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
 #define COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 63 matching lines @@
   // Returns the current application state (Foreground or Background). It always
   // returns Foreground if Chrome is not running on Android.
   DataUseUserData::AppState CurrentAppState() const;
 
   // Makes the full name of the histogram. It is made from |prefix| and suffix
   // which is made based on network and application status. suffix is a string
   // representing whether the data use was on the send ("Upstream") or receive
   // ("Downstream") path, whether the app was in the "Foreground" or
   // "Background", and whether a "Cellular" or "WiFi" network was use. For
   // example, "Prefix.Upstream.Foreground.Cellular" is a possible output.
-  // |started_in_foreground| indicates if the request started when the app was
-  // in foreground.
+  // |app_state| indicates the app state which can be foreground, background, or
+  // unknown.
   std::string GetHistogramName(const char* prefix,
                                TrafficDirection dir,
-                               bool started_in_foreground,
+                               DataUseUserData::AppState app_state,
                                bool is_connection_cellular) const;
 
 #if defined(OS_ANDROID)
   // Called whenever the application transitions from foreground to background
   // and vice versa.
   void OnApplicationStateChange(
       base::android::ApplicationState application_state);
 
   // Records the count of bytes received and sent by Chrome on the network as
   // reported by the operating system.
   void MaybeRecordNetworkBytesOS();
 #endif
 
   // Records the data use of the |request|, thus |request| must be non-null.
+  // |dir| is the direction (which is upstream or downstream) and |bytes| is the
+  // number of bytes in the direction.
+  void ReportDataUseUMAOnNetworkAccess(const net::URLRequest& request,
+                                       TrafficDirection dir,
+                                       int64_t bytes) const;
+
+  // Records the data use of the |request|, thus |request| must be non-null.
   void ReportDataUseUMA(const net::URLRequest& request) const;
 
   // A helper function used to record data use of services. It gets the size of
   // exchanged message, its direction (which is upstream or downstream) and
   // reports to two histogram groups. DataUse.MessageSize.ServiceName and
   // DataUse.Services.{Dimensions}. In the second one, services are buckets.
-  // |started_in_foreground| indicates if the request started when the app was
-  // in foreground.
+  // |app_state| indicates the app state which can be foreground, background, or
+  // unknown.
   void ReportDataUsageServices(
       data_use_measurement::DataUseUserData::ServiceName service,
       TrafficDirection dir,
-      bool started_in_foreground,
+      DataUseUserData::AppState app_state,
       bool is_connection_cellular,
       int64_t message_size) const;
 
   // Callback for updating data use prefs.
   // TODO(rajendrant): If a similar mechanism would need be used for components
   // other than metrics, then the better approach would be to refactor this
   // class to support registering arbitrary observers. crbug.com/601185
   metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_;
 
 #if defined(OS_ANDROID)
@@ skipping 16 matching lines @@
   // statistics.
   int64_t bytes_transferred_since_last_traffic_stats_query_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(DataUseMeasurement);
 };
 
 }  // namespace data_use_measurement
 
 #endif  // COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_