Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Unified Diff: trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc

Issue 307013003: Revert 273810 "Added alternative configuration for the data redu..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc
===================================================================
--- trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc (revision 273823)
+++ trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc (working copy)
@@ -18,12 +18,10 @@
DataReductionProxyChromeConfigurator::~DataReductionProxyChromeConfigurator() {
}
-void DataReductionProxyChromeConfigurator::Enable(
- bool primary_restricted,
- bool fallback_restricted,
- const std::string& primary_origin,
- const std::string& fallback_origin,
- const std::string& ssl_origin) {
+void DataReductionProxyChromeConfigurator::Enable(bool primary_restricted,
+ bool fallback_restricted,
+ const std::string& primary_origin,
+ const std::string& fallback_origin) {
DCHECK(prefs_);
DictionaryPrefUpdate update(prefs_, prefs::kProxy);
base::DictionaryValue* dict = update.Get();
@@ -51,13 +49,7 @@
return;
}
- std::string trimmed_ssl;
- base::TrimString(ssl_origin, "/", &trimmed_ssl);
-
- std::string server = "http=" + JoinString(proxies, ",") + ",direct://;"
- + (ssl_origin.empty() ? "" : ("https=" + trimmed_ssl + ",direct://;"));
-
- dict->SetString("server", server);
+ dict->SetString("server", "http=" + JoinString(proxies, ",") + ",direct://;");
dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_FIXED_SERVERS));
dict->SetString("bypass_list", JoinString(bypass_rules_, ", "));
}

Powered by Google App Engine
This is Rietveld 408576698