Make Data Reduction Proxy a best effort proxy

android_webview/browser/aw_browser_context.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 "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "base/base_paths_android.h"
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
-#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cookies/cookie_store.h"
 #include "net/proxy/proxy_config_service_android.h"
 #include "net/proxy/proxy_service.h"
 
 using base::FilePath;
 using content::BrowserThread;
-using data_reduction_proxy::DataReductionProxyConfigService;
+using data_reduction_proxy::DataReductionProxyConfigurator;
 using data_reduction_proxy::DataReductionProxyEventStore;
 using data_reduction_proxy::DataReductionProxySettings;
 
 namespace android_webview {
 
 namespace {
 
 // Shows notifications which correspond to PersistentPrefStore's reading errors.
 void HandleReadError(PersistentPrefStore::PrefReadError error) {
 }
@@ skipping 78 matching lines @@
   proxy_settings->SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
 }
 
 // static
 void AwBrowserContext::SetLegacyCacheRemovalDelayForTest(int delay_ms) {
   legacy_cache_removal_delay_ms_ = delay_ms;
 }
 
 void AwBrowserContext::PreMainMessageLoopRun() {
   cookie_store_ = CreateCookieStore(this);
-  data_reduction_proxy_settings_.reset(
-      new DataReductionProxySettings(
-          new data_reduction_proxy::DataReductionProxyParams(
-              data_reduction_proxy::DataReductionProxyParams::kAllowed)));
-  data_reduction_proxy_event_store_.reset(
-      new DataReductionProxyEventStore(
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)));
-  scoped_ptr<DataReductionProxyConfigService>
-      data_reduction_proxy_config_service(
-          new DataReductionProxyConfigService(
-              scoped_ptr<net::ProxyConfigService>(
-                  CreateProxyConfigService()).Pass()));
-  if (data_reduction_proxy_settings_.get()) {
-      data_reduction_proxy_configurator_.reset(
-          new data_reduction_proxy::DataReductionProxyConfigTracker(
-              base::Bind(&DataReductionProxyConfigService::UpdateProxyConfig,
-                         base::Unretained(
-                             data_reduction_proxy_config_service.get())),
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-    data_reduction_proxy_settings_->SetProxyConfigurator(
-        data_reduction_proxy_configurator_.get());
-  }
-
   FilePath cache_path;
   const FilePath fallback_cache_dir =
       GetPath().Append(FILE_PATH_LITERAL("Cache"));
   if (PathService::Get(base::DIR_CACHE, &cache_path)) {
     cache_path = cache_path.Append(
         FILE_PATH_LITERAL("org.chromium.android_webview"));
     // Delay the legacy dir removal to not impact startup performance.
     BrowserThread::PostDelayedTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&DeleteDirRecursively, fallback_cache_dir),
         base::TimeDelta::FromMilliseconds(legacy_cache_removal_delay_ms_));
   } else {
     cache_path = fallback_cache_dir;
     LOG(WARNING) << "Failed to get cache directory for Android WebView. "
                  << "Using app data directory as a fallback.";
   }
   url_request_context_getter_ =
-      new AwURLRequestContextGetter(cache_path,
-                                    cookie_store_.get(),
-                                    data_reduction_proxy_config_service.Pass());
+      new AwURLRequestContextGetter(
+          cache_path, cookie_store_.get(),
+          make_scoped_ptr(CreateProxyConfigService()).Pass());
+
+  data_reduction_proxy_settings_.reset(
+      new DataReductionProxySettings(
+          new data_reduction_proxy::DataReductionProxyParams(
+              data_reduction_proxy::DataReductionProxyParams::kAllowed)));
+  data_reduction_proxy_event_store_.reset(
+      new DataReductionProxyEventStore(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)));
+  if (data_reduction_proxy_settings_.get()) {

[sgurun-gerrit only, 2015/01/06 19:43:57]

why do we need this if?

[bengr, 2015/01/06 21:32:49]

You are right. I was carrying over some cruft. Done.

+    data_reduction_proxy_configurator_.reset(
+        new data_reduction_proxy::DataReductionProxyConfigurator(
+            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+            url_request_context_getter_->GetNetLog(),
+            data_reduction_proxy_event_store_.get()));
+    data_reduction_proxy_settings_->SetProxyConfigurator(
+        data_reduction_proxy_configurator_.get());
+  }
 
   visitedlink_master_.reset(
       new visitedlink::VisitedLinkMaster(this, this, false));
   visitedlink_master_->Init();
 
   form_database_service_.reset(
       new AwFormDatabaseService(context_storage_path_));
 }
 
 void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
@@ skipping 38 matching lines @@
 
 DataReductionProxySettings* AwBrowserContext::GetDataReductionProxySettings() {
   return data_reduction_proxy_settings_.get();
 }
 
 DataReductionProxyEventStore*
     AwBrowserContext::GetDataReductionProxyEventStore() {
   return data_reduction_proxy_event_store_.get();
 }
 
+data_reduction_proxy::DataReductionProxyConfigurator*
+AwBrowserContext::GetDataReductionProxyConfigurator() {
+  return data_reduction_proxy_configurator_.get();
+}
+
 AwURLRequestContextGetter* AwBrowserContext::GetAwURLRequestContext() {
   return url_request_context_getter_.get();
 }
 
 // Create user pref service for autofill functionality.
 void AwBrowserContext::CreateUserPrefServiceIfNecessary() {
   if (user_pref_service_)
     return;
 
   PrefRegistrySimple* pref_registry = new PrefRegistrySimple();
@@ skipping 121 matching lines @@
     data_reduction_proxy_statistics_ =
         scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(
             new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
                 user_pref_service_.get(),
                 base::MessageLoopProxy::current(),
                 commit_delay));
   }
 }
 
 }  // namespace android_webview