| Index: chrome/common/importer/ie_importer_test_registry_overrider_win.cc
|
| diff --git a/chrome/common/importer/ie_importer_test_registry_overrider_win.cc b/chrome/common/importer/ie_importer_test_registry_overrider_win.cc
|
| index 552a1d7ac8966a74512dd7a97030f4f791eef7c4..e84cb6502476d378a1824a52e4cf3222445b19bc 100644
|
| --- a/chrome/common/importer/ie_importer_test_registry_overrider_win.cc
|
| +++ b/chrome/common/importer/ie_importer_test_registry_overrider_win.cc
|
| @@ -30,7 +30,7 @@ bool GetTestKeyFromEnvironment(base::string16* key) {
|
| std::string value;
|
| bool result = env->GetVar(kTestHKCUOverrideEnvironmentVariable, &value);
|
| if (result)
|
| - *key = UTF8ToUTF16(value);
|
| + *key = base::UTF8ToUTF16(value);
|
| return result;
|
| }
|
|
|
| @@ -41,12 +41,12 @@ bool GetTestKeyFromEnvironment(base::string16* key) {
|
|
|
| IEImporterTestRegistryOverrider::IEImporterTestRegistryOverrider()
|
| : temporary_key_(kTestHKCUOverrideKeyPrefix +
|
| - UTF8ToUTF16(base::GenerateGUID())) {
|
| + base::UTF8ToUTF16(base::GenerateGUID())) {
|
| DCHECK(!GetTestKeyFromEnvironment(NULL));
|
|
|
| scoped_ptr<base::Environment> env(base::Environment::Create());
|
| bool success = env->SetVar(kTestHKCUOverrideEnvironmentVariable,
|
| - UTF16ToUTF8(temporary_key_));
|
| + base::UTF16ToUTF8(temporary_key_));
|
| DCHECK(success);
|
| }
|
|
|
|
|