Create component to expose network usage stats to consumers.

chrome/browser/net/chrome_network_delegate.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 <stdlib.h>
 
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/request_source_bandwidth_histograms.h"
 #include "chrome/browser/net/safe_search_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_management/task_manager_interface.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
+#include "components/data_usage/core/data_use_aggregator.h"
 #include "components/domain_reliability/monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ skipping 237 matching lines @@
     : profile_(NULL),
       enable_referrers_(enable_referrers),
       enable_do_not_track_(NULL),
       force_google_safe_search_(NULL),
       force_youtube_safety_mode_(NULL),
 #if defined(ENABLE_CONFIGURATION_POLICY)
       url_blacklist_manager_(NULL),
 #endif
       domain_reliability_monitor_(NULL),
       experimental_web_platform_features_enabled_(
-          base::CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableExperimentalWebPlatformFeatures)) {
+          base::CommandLine::ForCurrentProcess()
+              ->HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)),
+      data_use_aggregator_(nullptr),
+      is_data_usage_off_the_record_(true) {
   DCHECK(enable_referrers);
   extensions_delegate_.reset(
       ChromeExtensionsNetworkDelegate::Create(event_router));
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
 void ChromeNetworkDelegate::set_extension_info_map(
     extensions::InfoMap* extension_info_map) {
   extensions_delegate_->set_extension_info_map(extension_info_map);
 }
 
 void ChromeNetworkDelegate::set_profile(void* profile) {
   profile_ = profile;
   extensions_delegate_->set_profile(profile);
 }
 
 void ChromeNetworkDelegate::set_cookie_settings(
     content_settings::CookieSettings* cookie_settings) {
   cookie_settings_ = cookie_settings;
 }
 
 void ChromeNetworkDelegate::set_predictor(
     chrome_browser_net::Predictor* predictor) {
   connect_interceptor_.reset(
       new chrome_browser_net::ConnectInterceptor(predictor));
 }
 
+void ChromeNetworkDelegate::set_data_use_aggregator(
+    data_usage::DataUseAggregator* data_use_aggregator,
+    bool is_data_usage_off_the_record) {
+  data_use_aggregator_ = data_use_aggregator;
+  is_data_usage_off_the_record_ = is_data_usage_off_the_record;
+}
+
 // static
 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
     BooleanPrefMember* enable_referrers,
     BooleanPrefMember* enable_do_not_track,
     BooleanPrefMember* force_google_safe_search,
     BooleanPrefMember* force_youtube_safety_mode,
     PrefService* pref_service) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   enable_referrers->Init(prefs::kEnableReferrers, pref_service);
   enable_referrers->MoveToThread(
@@ skipping 148 matching lines @@
 
 void ChromeNetworkDelegate::OnNetworkBytesReceived(
     const net::URLRequest& request,
     int64_t bytes_received) {
 #if defined(ENABLE_TASK_MANAGER)
   // Note: Currently, OnNetworkBytesReceived is only implemented for HTTP jobs,
   // not FTP or other types, so those kinds of bytes will not be reported here.
   task_management::TaskManagerInterface::OnRawBytesRead(request,
                                                         bytes_received);
 #endif  // defined(ENABLE_TASK_MANAGER)
+
+  if (data_use_aggregator_) {

[bengr, 2015/10/06 19:30:27]

How about:

if (!data_use_aggregator_)
  return;

...

[sclittle, 2015/10/07 01:07:55]

We could, but that would make it harder to add new logic to the end of this
method in the future, and it would just have to be changed back then.

I don't mind changing this if you'd prefer the other way though.

+    if (is_data_usage_off_the_record_) {
+      data_use_aggregator_->ReportOffTheRecordDataUse(0 /* tx_bytes */,
+                                                      bytes_received);
+    } else {
+      data_use_aggregator_->ReportDataUse(request, -1 /* tab_id */,
+                                          0 /* tx_bytes */, bytes_received);
+    }
+  }
+}
+
+void ChromeNetworkDelegate::OnNetworkBytesSent(const net::URLRequest& request,
+                                               int64_t bytes_sent) {
+  if (data_use_aggregator_) {

[bengr, 2015/10/06 19:30:27]

Same here.

[sclittle, 2015/10/07 01:07:55]

See above.

+    if (is_data_usage_off_the_record_) {
+      data_use_aggregator_->ReportOffTheRecordDataUse(bytes_sent,
+                                                      0 /* rx_bytes */);
+    } else {
+      data_use_aggregator_->ReportDataUse(request, -1 /* tab_id */, bytes_sent,
+                                          0 /* rx_bytes */);
+    }
+  }
 }
 
 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
                                         bool started) {
 #if !defined(OS_IOS)
   // TODO(amohammadkhan): Verify that there is no double recording in data use
   // of redirected requests.
   data_use_measurement_.ReportDataUseUMA(request);
 #endif
   RecordNetworkErrorHistograms(request);
@@ skipping 198 matching lines @@
   return experimental_web_platform_features_enabled_;
 }
 
 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
     const net::URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   ReportInvalidReferrerSend(target_url, referrer_url);
   return true;
 }