Move data reduction proxy logic out of chrome and android webview network delegate

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 15 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/client_hints.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/safe_search_util.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/core/browser/data_reduction_proxy_auth_request_handler.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.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"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
-#include "net/proxy/proxy_config.h"
-#include "net/proxy/proxy_info.h"
-#include "net/proxy/proxy_retry_info.h"
-#include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/io_thread.h"
 #include "components/precache/content/precache_manager.h"
 #include "components/precache/content/precache_manager_factory.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 40 matching lines @@
 void ForceGoogleSafeSearchCallbackWrapper(
     const net::CompletionCallback& callback,
     net::URLRequest* request,
     GURL* new_url,
     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,
-    data_reduction_proxy::DataReductionProxyStatisticsPrefs* statistics_prefs) {
-  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;
-
-  // Ignore off-the-record data.
-  if (!g_browser_process->profile_manager()->IsValidProfile(profile) ||
-      profile->IsOffTheRecord()) {
-    return;
-  }
-  data_reduction_proxy::UpdateContentLengthPrefs(
-      received_content_length,
-      original_content_length,
-      profile->GetPrefs(),
-      request_type, statistics_prefs);
-}
-
-void StoreAccumulatedContentLength(
-    int received_content_length,
-    int original_content_length,
-    data_reduction_proxy::DataReductionProxyRequestType request_type,
-    Profile* profile,
-    data_reduction_proxy::DataReductionProxyStatisticsPrefs* statistics_prefs) {
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      base::Bind(&UpdateContentLengthPrefs,
-                 received_content_length,
-                 original_content_length,
-                 request_type,
-                 profile,
-                 statistics_prefs));
-}
-
 void RecordContentLengthHistograms(

[bengr, 2014/11/18 19:30:55]

This should be moved to the DRPNetworkDelegate.

[megjablon, 2014/11/19 19:23:40]

Done.

     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",
                          received_content_length);
     UMA_HISTOGRAM_COUNTS("Net.HttpOriginalContentLengthWithValidOCL",
                          original_content_length);
@@ skipping 75 matching lines @@
 
 }  // namespace
 
 ChromeNetworkDelegate::ChromeNetworkDelegate(
     extensions::EventRouterForwarder* event_router,
     BooleanPrefMember* enable_referrers)
     : profile_(NULL),
       enable_referrers_(enable_referrers),
       enable_do_not_track_(NULL),
       force_google_safe_search_(NULL),
-      data_reduction_proxy_enabled_(NULL),
 #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_statistics_prefs_(NULL) {
+      prerender_tracker_(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 47 matching lines @@
     force_google_safe_search->MoveToThread(
         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 on desktop.
-base::Value* ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue(
-    PrefService* prefs) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  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.
-  dict->SetString("historic_received_content_length",
-                  base::Int64ToString(total_received));
-  dict->SetString("historic_original_content_length",
-                  base::Int64ToString(total_original));
-  return dict;
-}
-
-base::Value* ChromeNetworkDelegate::SessionNetworkStatsInfoToValue() const {
-  base::DictionaryValue* dict = new base::DictionaryValue();
-  // Use strings to avoid overflow.  base::Value only supports 32-bit integers.
-  dict->SetString("session_received_content_length",
-                  base::Int64ToString(received_content_length_));
-  dict->SetString("session_original_content_length",
-                  base::Int64ToString(original_content_length_));
-  return dict;
-}
-
 int ChromeNetworkDelegate::OnBeforeURLRequest(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     GURL* new_url) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // TODO(joaodasilva): This prevents extensions from seeing URLs that are
   // blocked. However, an extension might redirect the request to another URL,
   // which is not blocked.
   int error = net::ERR_BLOCKED_BY_ADMINISTRATOR;
   if (url_blacklist_manager_ &&
@@ skipping 36 matching lines @@
 
   if (force_safe_search && rv == net::OK && new_url->is_empty())
     safe_search_util::ForceGoogleSafeSearch(request, new_url);
 
   if (connect_interceptor_)
     connect_interceptor_->WitnessURLRequest(request);
 
   return rv;
 }
 
-void ChromeNetworkDelegate::OnResolveProxy(
-    const GURL& url,
-    int load_flags,
-    const net::ProxyService& proxy_service,
-    net::ProxyInfo* result) {
-  if (!on_resolve_proxy_handler_.is_null() &&
-      !proxy_config_getter_.is_null()) {
-    on_resolve_proxy_handler_.Run(url, load_flags,
-                                  proxy_config_getter_.Run(),
-                                  proxy_service.config(),
-                                  proxy_service.proxy_retry_info(),
-                                  data_reduction_proxy_params_, result);
-  }
-}
-
-void ChromeNetworkDelegate::OnProxyFallback(const net::ProxyServer& bad_proxy,
-                                            int net_error) {
-  if (data_reduction_proxy_usage_stats_) {
-    data_reduction_proxy_usage_stats_->OnProxyFallback(
-        bad_proxy, net_error);
-  }
-}
-
 int ChromeNetworkDelegate::OnBeforeSendHeaders(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     net::HttpRequestHeaders* headers) {
   bool force_safe_search = force_google_safe_search_ &&
                            force_google_safe_search_->GetValue();
   if (force_safe_search)
     safe_search_util::ForceYouTubeSafetyMode(request, headers);
 
   TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "SendRequest");
   return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers);
 }
 
-void ChromeNetworkDelegate::OnBeforeSendProxyHeaders(
-    net::URLRequest* request,
-    const net::ProxyInfo& proxy_info,
-    net::HttpRequestHeaders* headers) {
-  if (data_reduction_proxy_auth_request_handler_) {
-    data_reduction_proxy_auth_request_handler_->MaybeAddRequestHeader(
-        request, proxy_info.proxy_server(), headers);
-  }
-}
-
 void ChromeNetworkDelegate::OnSendHeaders(
     net::URLRequest* request,
     const net::HttpRequestHeaders& headers) {
   extensions_delegate_->OnSendHeaders(request, headers);
 }
 
 int ChromeNetworkDelegate::OnHeadersReceived(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     const net::HttpResponseHeaders* original_response_headers,
@@ skipping 27 matching lines @@
 #if defined(ENABLE_TASK_MANAGER)
   // This is not completely accurate, but as a first approximation ignore
   // requests that are served from the cache. See bug 330931 for more info.
   if (!request.was_cached())
     TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
 #endif  // defined(ENABLE_TASK_MANAGER)
 }
 
 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
                                         bool started) {
-  if (data_reduction_proxy_usage_stats_)
-    data_reduction_proxy_usage_stats_->OnUrlRequestCompleted(request, started);
-
   TRACE_EVENT_ASYNC_END0("net", "URLRequest", request);
   if (request->status().status() == net::URLRequestStatus::SUCCESS) {
     // For better accuracy, we use the actual bytes read instead of the length
     // specified with the Content-Length header, which may be inaccurate,
     // or missing, as is the case with chunked encoding.
     int64 received_content_length = request->received_response_content_length();
 
 #if defined(OS_ANDROID)
     if (precache::PrecacheManager::IsPrecachingEnabled()) {
       // Record precache metrics when a fetch is completed successfully, if
       // precaching is enabled.
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           base::Bind(&RecordPrecacheStatsOnUIThread, request->url(),
                      base::Time::Now(), received_content_length,
                      request->was_cached(), profile_));
     }
 #endif  // defined(OS_ANDROID)
 
     // Only record for http or https urls.
     bool is_http = request->url().SchemeIs("http");
     bool is_https = request->url().SchemeIs("https");
 
     if (!request->was_cached() &&         // Don't record cached content
         received_content_length &&        // Zero-byte responses aren't useful.
         (is_http || is_https)) {          // Only record for HTTP or HTTPS urls.
       int64 original_content_length =
           request->response_info().headers->GetInt64HeaderValue(
               "x-original-content-length");

[bengr, 2014/11/18 19:30:55]

This should be moved to the DRPNetworkDelegate.

[megjablon, 2014/11/19 19:23:40]

Done.

-      data_reduction_proxy::DataReductionProxyRequestType request_type =
-          data_reduction_proxy::GetDataReductionProxyRequestType(request);
 
       base::TimeDelta freshness_lifetime =

[bengr, 2014/11/18 19:30:55]

This should be moved to the DRPNetworkDelegate.

[megjablon, 2014/11/19 19:23:40]

Done.

           request->response_info().headers->GetFreshnessLifetimes(
               request->response_info().response_time).freshness;
-      int64 adjusted_original_content_length =
-          data_reduction_proxy::GetAdjustedOriginalContentLength(
-              request_type, original_content_length,
-              received_content_length);
-      AccumulateContentLength(received_content_length,
-                              adjusted_original_content_length,
-                              request_type);
+
       RecordContentLengthHistograms(received_content_length,

[bengr, 2014/11/18 19:30:55]

This should be moved to the DRPNetworkDelegate.

[megjablon, 2014/11/19 19:23:40]

Done.

                                     original_content_length,
                                     freshness_lifetime);
 
-      if (data_reduction_proxy_enabled_ &&
-          data_reduction_proxy_usage_stats_ &&
-          !proxy_config_getter_.is_null()) {
-        data_reduction_proxy_usage_stats_->RecordBytesHistograms(
-            request,
-            *data_reduction_proxy_enabled_,
-            proxy_config_getter_.Run());
-      }
       DVLOG(2) << __FUNCTION__

[bengr, 2014/11/18 19:30:55]

This should be moved to the DRPNetworkDelegate.

[megjablon, 2014/11/19 19:23:40]

Done.

           << " received content length: " << received_content_length
           << " original content length: " << original_content_length
           << " url: " << request->url();
     }
 
     extensions_delegate_->OnCompleted(request, started);
   } else if (request->status().status() == net::URLRequestStatus::FAILED ||
              request->status().status() == net::URLRequestStatus::CANCELED) {
     extensions_delegate_->OnCompleted(request, started);
   } else {
@@ skipping 196 matching lines @@
 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
     const net::URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   base::debug::StackTrace callstack;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&ReportInvalidReferrerSend, target_url,
                                      referrer_url, callstack));
   return true;
 }
-
-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);
-  if (data_reduction_proxy_statistics_prefs_) {
-    StoreAccumulatedContentLength(received_content_length,
-                                  original_content_length,
-                                  request_type,
-                                  reinterpret_cast<Profile*>(profile_),
-                                  data_reduction_proxy_statistics_prefs_);
-  }
-  received_content_length_ += received_content_length;
-  original_content_length_ += original_content_length;
-}