| Index: android_webview/browser/aw_browser_context.cc
|
| diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
|
| index 4287b02514445696ed74f8dba84bf9ef92daf4de..e7e1b7757424da8d85e16360f3eaa0c9c18a629e 100644
|
| --- a/android_webview/browser/aw_browser_context.cc
|
| +++ b/android_webview/browser/aw_browser_context.cc
|
| @@ -15,7 +15,6 @@
|
| #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/browser/data_reduction_proxy_auth_request_handler.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
|
| @@ -29,7 +28,6 @@
|
|
|
| using base::FilePath;
|
| using content::BrowserThread;
|
| -using data_reduction_proxy::DataReductionProxyAuthRequestHandler;
|
| using data_reduction_proxy::DataReductionProxySettings;
|
|
|
| namespace android_webview {
|
| @@ -102,9 +100,6 @@ void AwBrowserContext::PreMainMessageLoopRun() {
|
| new DataReductionProxySettings(
|
| new data_reduction_proxy::DataReductionProxyParams(
|
| data_reduction_proxy::DataReductionProxyParams::kAllowed)));
|
| - data_reduction_proxy_auth_request_handler_.reset(
|
| - new DataReductionProxyAuthRequestHandler(
|
| - data_reduction_proxy_settings_->params()));
|
| #endif
|
|
|
| url_request_context_getter_ =
|
| @@ -113,7 +108,7 @@ void AwBrowserContext::PreMainMessageLoopRun() {
|
| if (data_reduction_proxy_settings_.get()) {
|
| scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
|
| configurator(new data_reduction_proxy::DataReductionProxyConfigTracker(
|
| - url_request_context_getter_->proxy_config_service(),
|
| + url_request_context_getter_->GetDataReductionProxyConfigService(),
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
|
| data_reduction_proxy_settings_->SetProxyConfigurator(configurator.Pass());
|
| }
|
| @@ -169,11 +164,6 @@ DataReductionProxySettings* AwBrowserContext::GetDataReductionProxySettings() {
|
| return data_reduction_proxy_settings_.get();
|
| }
|
|
|
| -DataReductionProxyAuthRequestHandler*
|
| -AwBrowserContext::GetDataReductionProxyAuthRequestHandler() {
|
| - return data_reduction_proxy_auth_request_handler_.get();
|
| -}
|
| -
|
| // Create user pref service for autofill functionality.
|
| void AwBrowserContext::CreateUserPrefServiceIfNecessary() {
|
| if (user_pref_service_)
|
|
|