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

Unified Diff: components/policy/core/common/preg_parser_win.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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: components/policy/core/common/preg_parser_win.cc
diff --git a/components/policy/core/common/preg_parser_win.cc b/components/policy/core/common/preg_parser_win.cc
index de3e22dc072b512e4157584ac6b454bc0cdc96de..ee3fd2d9c4b545fc8e3c2b03abf5fa5e91fa8fa5 100644
--- a/components/policy/core/common/preg_parser_win.cc
+++ b/components/policy/core/common/preg_parser_win.cc
@@ -107,7 +107,7 @@ std::string DecodePRegStringValue(const std::vector<uint8>& data) {
base::string16 result;
std::transform(chars, chars + len - 1, std::back_inserter(result),
std::ptr_fun(base::ByteSwapToLE16));
- return UTF16ToUTF8(result);
+ return base::UTF16ToUTF8(result);
}
// Decodes a value from a PReg file given as a uint8 vector.
@@ -162,7 +162,7 @@ void HandleRecord(const base::string16& key_name,
entry != path.end(); ++entry) {
if (entry->empty())
continue;
- const std::string name = UTF16ToUTF8(*entry);
+ const std::string name = base::UTF16ToUTF8(*entry);
RegistryDict* subdict = dict->GetKey(name);
if (!subdict) {
subdict = new RegistryDict();
@@ -174,7 +174,7 @@ void HandleRecord(const base::string16& key_name,
if (value.empty())
return;
- std::string value_name(UTF16ToUTF8(value));
+ std::string value_name(base::UTF16ToUTF8(value));
if (!StartsWithASCII(value_name, kActionTriggerPrefix, true)) {
scoped_ptr<base::Value> value;
if (DecodePRegValue(type, data, &value))
« no previous file with comments | « components/policy/core/common/policy_loader_win_unittest.cc ('k') | components/policy/core/common/registry_dict_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698