diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
| commit | d46bc310b61db608ee250f042292364c7bf44656 (patch) | |
| tree | ed8033562cef79f3f750ed7113aed88c4c205607 /chrome/browser/net/spdyproxy/proxy_advisor.cc | |
| parent | 8dcaa264e5fa488d2ac287bf63d2376259fdab25 (diff) | |
| download | chromium_src-d46bc310b61db608ee250f042292364c7bf44656.zip chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.gz chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.bz2 | |
Revert 273810 "Added alternative configuration for the data redu..."
Reverting due to failing tests. See http://crbug.com/370039#c5 for details.
> Added alternative configuration for the data reduction proxy
>
> Added a second configuration that can support two http proxies and one https proxy. In the process, added a new DataReductionProxyParams object to encapsulate static configuration details and made DataReductionSettingsAndroid a BrowserKeyedContextService.
>
> BUG=370039
>
> Review URL: https://codereview.chromium.org/286013002
TBR=bengr@chromium.org
Review URL: https://codereview.chromium.org/307013003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/spdyproxy/proxy_advisor.cc')
| -rw-r--r-- | chrome/browser/net/spdyproxy/proxy_advisor.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/net/spdyproxy/proxy_advisor.cc b/chrome/browser/net/spdyproxy/proxy_advisor.cc index 3f219a8..f15851a 100644 --- a/chrome/browser/net/spdyproxy/proxy_advisor.cc +++ b/chrome/browser/net/spdyproxy/proxy_advisor.cc @@ -11,7 +11,6 @@ #include "base/stl_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h" #include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" @@ -22,8 +21,6 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -// TODO(marq): Remove this class because it is not being used. - // Ensure data reduction features are available. #if !defined(OS_ANDROID) && !defined(OS_IOS) #error proxy_advisor should only be included in Android or iOS builds. @@ -122,12 +119,8 @@ void ProxyAdvisor::Advise( std::string motivation_name(MotivationName(motivation, is_preconnect)); std::string header_value = motivation_name + " " + url.spec(); net::URLRequestContext* context = context_getter_->GetURLRequestContext(); - data_reduction_proxy::DataReductionProxyParams params( - data_reduction_proxy::DataReductionProxyParams::kAllowed | - data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed | - data_reduction_proxy::DataReductionProxyParams::kPromoAllowed); std::string endpoint = - params.origin().spec() + "preconnect"; + DataReductionProxySettings::GetDataReductionProxyOrigin() + "preconnect"; scoped_ptr<net::URLRequest> request = context->CreateRequest( GURL(endpoint), net::DEFAULT_PRIORITY, this, NULL); request->set_method("HEAD"); |