Change a bunch of string types.
Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).
TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/2854015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51157 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index b0320e9..ea5da62 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -258,8 +258,8 @@
const std::string& wrapped_key) {
PrefService* prefs = g_browser_process->local_state();
if (prefs) {
- prefs->SetString(prefs::kSafeBrowsingClientKey, ASCIIToWide(client_key));
- prefs->SetString(prefs::kSafeBrowsingWrappedKey, ASCIIToWide(wrapped_key));
+ prefs->SetString(prefs::kSafeBrowsingClientKey, client_key);
+ prefs->SetString(prefs::kSafeBrowsingWrappedKey, wrapped_key);
}
}
@@ -604,9 +604,9 @@
std::string client_key, wrapped_key;
if (local_state) {
client_key =
- WideToASCII(local_state->GetString(prefs::kSafeBrowsingClientKey));
+ local_state->GetString(prefs::kSafeBrowsingClientKey);
wrapped_key =
- WideToASCII(local_state->GetString(prefs::kSafeBrowsingWrappedKey));
+ local_state->GetString(prefs::kSafeBrowsingWrappedKey);
}
// We will issue network fetches using the default profile's request context.
