| Index: components/policy/core/common/registry_dict_win.cc
|
| diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
|
| index a843d89630967848e17d2662ec13cdbfd88b2986..47746522dd843675c1bfb039eb906620566c7d99 100644
|
| --- a/components/policy/core/common/registry_dict_win.cc
|
| +++ b/components/policy/core/common/registry_dict_win.cc
|
| @@ -243,13 +243,14 @@ void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
|
|
|
| // First, read all the values of the key.
|
| for (RegistryValueIterator it(hive, root.c_str()); it.Valid(); ++it) {
|
| - const std::string name = UTF16ToUTF8(it.Name());
|
| + const std::string name = base::UTF16ToUTF8(it.Name());
|
| switch (it.Type()) {
|
| case REG_SZ:
|
| case REG_EXPAND_SZ:
|
| SetValue(
|
| name,
|
| - make_scoped_ptr(new base::StringValue(UTF16ToUTF8(it.Value()))));
|
| + make_scoped_ptr(
|
| + new base::StringValue(base::UTF16ToUTF8(it.Value()))));
|
| continue;
|
| case REG_DWORD_LITTLE_ENDIAN:
|
| case REG_DWORD_BIG_ENDIAN:
|
| @@ -282,7 +283,7 @@ void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
|
|
|
| // Recurse for all subkeys.
|
| for (RegistryKeyIterator it(hive, root.c_str()); it.Valid(); ++it) {
|
| - std::string name(UTF16ToUTF8(it.Name()));
|
| + std::string name(base::UTF16ToUTF8(it.Name()));
|
| scoped_ptr<RegistryDict> subdict(new RegistryDict());
|
| subdict->ReadRegistry(hive, root + L"\\" + it.Name());
|
| SetKey(name, subdict.Pass());
|
|
|