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

Unified Diff: chrome/browser/prefs/command_line_pref_store.cc

Issue 1320533007: Componentize ssl_config_service_manager_pref.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move unittest to components/ssl_config Created 5 years, 2 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: chrome/browser/prefs/command_line_pref_store.cc
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 687bd27437ccdb671be14c00ef4e07a181caea04..d64bde70ca7abe4b880e04f39126ac5ccd44a47c 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -18,6 +18,8 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
#include "components/proxy_config/proxy_config_dictionary.h"
#include "components/proxy_config/proxy_config_pref_names.h"
+#include "components/ssl_config/ssl_config_prefs.h"
+#include "components/ssl_config/ssl_config_switches.h"
#include "ui/base/ui_base_switches.h"
#if defined(OS_CHROMEOS)
@@ -30,9 +32,10 @@ const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
{ data_reduction_proxy::switches::kDataReductionProxy,
data_reduction_proxy::prefs::kDataReductionProxy },
{ switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist },
- { switches::kSSLVersionMin, prefs::kSSLVersionMin },
- { switches::kSSLVersionMax, prefs::kSSLVersionMax },
- { switches::kSSLVersionFallbackMin, prefs::kSSLVersionFallbackMin },
+ { switches::kSSLVersionMin, ssl_config::prefs::kSSLVersionMin },
+ { switches::kSSLVersionMax, ssl_config::prefs::kSSLVersionMax },
+ { switches::kSSLVersionFallbackMin,
+ ssl_config::prefs::kSSLVersionFallbackMin },
#if defined(OS_ANDROID)
{ switches::kAuthAndroidNegotiateAccountType,
prefs::kAuthAndroidNegotiateAccountType },
@@ -185,7 +188,7 @@ void CommandLinePrefStore::ApplySSLSwitches() {
list_value->AppendStrings(base::SplitString(
command_line_->GetSwitchValueASCII(switches::kCipherSuiteBlacklist),
",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL));
- SetValue(prefs::kCipherSuiteBlacklist, list_value.Pass(),
+ SetValue(ssl_config::prefs::kCipherSuiteBlacklist, list_value.Pass(),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
}
}

Powered by Google App Engine
This is Rietveld 408576698