Fix foregound vs background data use measurement

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 22 matching lines @@
 // Android, the UMA is further broken down by whether the application was in the
 // background or foreground during the request.
 // TODO(amohammadkhan): Complete the layered architecture.
 // http://crbug.com/527460
 class DataUseMeasurement {
  public:
   explicit DataUseMeasurement(
       const metrics::UpdateUsagePrefCallbackType& metrics_data_use_forwarder);
   ~DataUseMeasurement();
 
+  // Called before a request is sent.
+  void OnBeforeURLRequest(net::URLRequest* request);
+
   // Called right after a redirect response code was received for |request|.
   void OnBeforeRedirect(const net::URLRequest& request,
                         const GURL& new_location);
 
   // Called when data is received or sent on the network, respectively.
   void OnNetworkBytesReceived(const net::URLRequest& request,
                               int64_t bytes_received);
   void OnNetworkBytesSent(const net::URLRequest& request, int64_t bytes_sent);
 
   // Indicates that |request| has been completed or failed.
   void OnCompleted(const net::URLRequest& request, bool started);
 
   // Returns true if the URLRequest |request| is initiated by user traffic.
   static bool IsUserInitiatedRequest(const net::URLRequest& request);
 
 #if defined(OS_ANDROID)
   // This function should just be used for testing purposes. A change in
   // application state can be simulated by calling this function.
   void OnApplicationStateChangeForTesting(
       base::android::ApplicationState application_state);
 #endif
 
  private:
+  friend class DataUseMeasurementTest;
+
   // Specifies that data is received or sent, respectively.
   enum TrafficDirection { DOWNSTREAM, UPSTREAM };
 
-  // The state of the application. Only available on Android and on other
-  // platforms it is always FOREGROUND.
-  enum AppState { BACKGROUND, FOREGROUND };
-
   // Returns the current application state (Foreground or Background). It always
   // returns Foreground if Chrome is not running on Android.
-  AppState CurrentAppState() const;
+  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.
   std::string GetHistogramName(const char* prefix,
                                TrafficDirection dir,
+                               bool started_in_foreground,
                                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.
   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.
   void ReportDataUsageServices(
       data_use_measurement::DataUseUserData::ServiceName service,
       TrafficDirection dir,
+      bool started_in_foreground,
       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_