Move data use measurement to DataUseNetworkDelegate

components/data_use_measurement/core/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 11 matching lines @@
 #endif
 
 class GURL;
 
 namespace net {
 class URLRequest;
 }
 
 namespace data_use_measurement {
 
+class URLRequestClassifier;
+
 // Records the data use of user traffic and various services in UMA histograms.
 // The UMA is broken down by network technology used (Wi-Fi vs cellular). On
 // 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(
+  DataUseMeasurement(
+      std::unique_ptr<URLRequestClassifier> url_request_classifier,
       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;
   FRIEND_TEST_ALL_PREFIXES(DataUseMeasurementTest,
@@ skipping 33 matching lines @@
   // 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 ReportDataUseUMA(const net::URLRequest& request,
                         TrafficDirection dir,
                         int64_t bytes);
 
   // Updates the data use of the |request|, thus |request| must be non-null.
   void UpdateDataUsePrefs(const net::URLRequest& request) const;
 
+  // Reports the message size of the service requests.
+  void ReportServicesMessageSizeUMA(const net::URLRequest& request);
+
   // 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.
   // |app_state| indicates the app state which can be foreground, background, or
   // unknown.
   void ReportDataUsageServices(
       data_use_measurement::DataUseUserData::ServiceName service,
       TrafficDirection dir,
       DataUseUserData::AppState app_state,
       bool is_connection_cellular,
       int64_t message_size) const;
 
+  // Classifier for identifying if an URL request is user initiated.
+  std::unique_ptr<URLRequestClassifier> url_request_classifier_;
+
   // 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)
   // Application listener store the last known state of the application in this
   // field.
   base::android::ApplicationState app_state_;
@@ skipping 20 matching lines @@
   // True if app is in background and first network read has not yet happened.
   bool no_reads_since_background_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(DataUseMeasurement);
 };
 
 }  // namespace data_use_measurement
 
 #endif  // COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_