Update data reduction proxy statistics prefs less often on desktop

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 13 matching lines @@
 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
 #include "chrome/browser/net/client_hints.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/safe_search_util.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_delayed_pref_service.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_metrics.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.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 "net/base/host_port_pair.h"
@@ skipping 63 matching lines @@
     int rv) {
   if (rv == net::OK && new_url->is_empty())
     safe_search_util::ForceGoogleSafeSearch(request, new_url);
   callback.Run(rv);
 }
 
 void UpdateContentLengthPrefs(
     int received_content_length,
     int original_content_length,
     data_reduction_proxy::DataReductionProxyRequestType request_type,
-    Profile* profile) {
+    Profile* profile,
+    data_reduction_proxy::DataReductionProxyDelayedPrefService* pref_service) {

[bengr, 2014/08/14 17:39:41]

DCHECK(pref_service)

Also, after the class renaming, I would call the variable statistics_prefs.

[megjablon, 2014/08/26 19:28:40]

Done.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_GE(received_content_length, 0);
   DCHECK_GE(original_content_length, 0);
 
   // Can be NULL in a unit test.
   if (!g_browser_process)
     return;
 
-  PrefService* prefs = g_browser_process->local_state();
-  if (!prefs)
+  if (!pref_service)

[bengr, 2014/08/14 17:39:41]

Why would this ever be null?

[megjablon, 2014/08/26 19:28:40]

Done.

     return;
 
   // Ignore off-the-record data.
   if (!g_browser_process->profile_manager()->IsValidProfile(profile) ||
       profile->IsOffTheRecord()) {
     return;
   }
 #if defined(OS_ANDROID)
   // If Android ever goes multi profile, the profile should be passed so that
   // the browser preference will be taken.
   bool with_data_reduction_proxy_enabled =
       ProfileManager::GetActiveUserProfile()->GetPrefs()->GetBoolean(
           data_reduction_proxy::prefs::kDataReductionProxyEnabled);
 #else
   bool with_data_reduction_proxy_enabled = false;
 #endif
 
-  data_reduction_proxy::UpdateContentLengthPrefs(received_content_length,
-                                         original_content_length,
-                                         with_data_reduction_proxy_enabled,
-                                         request_type, prefs);
+  data_reduction_proxy::UpdateContentLengthPrefs(
+      received_content_length,
+      original_content_length,
+      with_data_reduction_proxy_enabled,
+      request_type,
+      pref_service);
 }
 
 void StoreAccumulatedContentLength(
     int received_content_length,
     int original_content_length,
     data_reduction_proxy::DataReductionProxyRequestType request_type,
-    Profile* profile) {
+    Profile* profile,
+    data_reduction_proxy::DataReductionProxyDelayedPrefService* pref_service) {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&UpdateContentLengthPrefs,
                  received_content_length, original_content_length,
-                 request_type, profile));
+                 request_type, profile, pref_service));
 }
 
 void RecordContentLengthHistograms(
     int64 received_content_length,
     int64 original_content_length,
     const base::TimeDelta& freshness_lifetime) {
   // Add the current resource to these histograms only when a valid
   // X-Original-Content-Length header is present.
   if (original_content_length >= 0) {
     UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthWithValidOCL",
@@ skipping 75 matching lines @@
 #if defined(ENABLE_CONFIGURATION_POLICY)
       url_blacklist_manager_(NULL),
 #endif
       domain_reliability_monitor_(NULL),
       received_content_length_(0),
       original_content_length_(0),
       first_request_(true),
       prerender_tracker_(NULL),
       data_reduction_proxy_params_(NULL),
       data_reduction_proxy_usage_stats_(NULL),
-      data_reduction_proxy_auth_request_handler_(NULL) {
+      data_reduction_proxy_auth_request_handler_(NULL),
+      data_reduction_proxy_delayed_pref_service_(NULL) {
   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);
@@ skipping 48 matching lines @@
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
   }
 }
 
 // static
 void ChromeNetworkDelegate::AllowAccessToAllFiles() {
   g_allow_file_access_ = true;
 }
 
 // static
+// TODO(megjablon): Use data_reduction_proxy_delayed_pref_service to read prefs.
+// Until updated the pref values may be up to an hour behind.

[bengr, 2014/08/14 17:39:41]

Please file a bug to fix this.

[megjablon, 2014/08/26 19:28:40]

Done.

 base::Value* ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* prefs = g_browser_process->local_state();
   int64 total_received = prefs->GetInt64(
       data_reduction_proxy::prefs::kHttpReceivedContentLength);
   int64 total_original = prefs->GetInt64(
       data_reduction_proxy::prefs::kHttpOriginalContentLength);
 
   base::DictionaryValue* dict = new base::DictionaryValue();
   // Use strings to avoid overflow.  base::Value only supports 32-bit integers.
@@ skipping 460 matching lines @@
 #endif
   return net::OK;
 }
 
 void ChromeNetworkDelegate::AccumulateContentLength(
     int64 received_content_length,
     int64 original_content_length,
     data_reduction_proxy::DataReductionProxyRequestType request_type) {
   DCHECK_GE(received_content_length, 0);
   DCHECK_GE(original_content_length, 0);
-  StoreAccumulatedContentLength(received_content_length,
-                                original_content_length,
-                                request_type,
-                                reinterpret_cast<Profile*>(profile_));
+  if (data_reduction_proxy_delayed_pref_service_) {
+    StoreAccumulatedContentLength(received_content_length,
+                                  original_content_length,
+                                  request_type,
+                                  reinterpret_cast<Profile*>(profile_),
+                                  data_reduction_proxy_delayed_pref_service_);
+  }
   received_content_length_ += received_content_length;
   original_content_length_ += original_content_length;
 }