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

Side by Side Diff: chrome/common/importer/ie_importer_test_registry_overrider_win.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/importer/firefox_importer_utils.cc ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h" 5 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 12 matching lines...) Expand all
23 "IE_IMPORTER_TEST_OVERRIDE_HKCU"; 23 "IE_IMPORTER_TEST_OVERRIDE_HKCU";
24 24
25 // Reads the environment variable set by a previous call to 25 // Reads the environment variable set by a previous call to
26 // SetTestRegistryOverride() into |key| if it exists and |key| is not NULL. 26 // SetTestRegistryOverride() into |key| if it exists and |key| is not NULL.
27 // Returns true if the variable was successfully read. 27 // Returns true if the variable was successfully read.
28 bool GetTestKeyFromEnvironment(base::string16* key) { 28 bool GetTestKeyFromEnvironment(base::string16* key) {
29 scoped_ptr<base::Environment> env(base::Environment::Create()); 29 scoped_ptr<base::Environment> env(base::Environment::Create());
30 std::string value; 30 std::string value;
31 bool result = env->GetVar(kTestHKCUOverrideEnvironmentVariable, &value); 31 bool result = env->GetVar(kTestHKCUOverrideEnvironmentVariable, &value);
32 if (result) 32 if (result)
33 *key = UTF8ToUTF16(value); 33 *key = base::UTF8ToUTF16(value);
34 return result; 34 return result;
35 } 35 }
36 36
37 } // namespace 37 } // namespace
38 38
39 //////////////////////////////////////////////////////////////////////////////// 39 ////////////////////////////////////////////////////////////////////////////////
40 // IEImporterTestRegistryOverrider, public: 40 // IEImporterTestRegistryOverrider, public:
41 41
42 IEImporterTestRegistryOverrider::IEImporterTestRegistryOverrider() 42 IEImporterTestRegistryOverrider::IEImporterTestRegistryOverrider()
43 : temporary_key_(kTestHKCUOverrideKeyPrefix + 43 : temporary_key_(kTestHKCUOverrideKeyPrefix +
44 UTF8ToUTF16(base::GenerateGUID())) { 44 base::UTF8ToUTF16(base::GenerateGUID())) {
45 DCHECK(!GetTestKeyFromEnvironment(NULL)); 45 DCHECK(!GetTestKeyFromEnvironment(NULL));
46 46
47 scoped_ptr<base::Environment> env(base::Environment::Create()); 47 scoped_ptr<base::Environment> env(base::Environment::Create());
48 bool success = env->SetVar(kTestHKCUOverrideEnvironmentVariable, 48 bool success = env->SetVar(kTestHKCUOverrideEnvironmentVariable,
49 UTF16ToUTF8(temporary_key_)); 49 base::UTF16ToUTF8(temporary_key_));
50 DCHECK(success); 50 DCHECK(success);
51 } 51 }
52 52
53 IEImporterTestRegistryOverrider::~IEImporterTestRegistryOverrider() { 53 IEImporterTestRegistryOverrider::~IEImporterTestRegistryOverrider() {
54 base::win::RegKey reg_key(HKEY_CURRENT_USER, temporary_key_.c_str(), 54 base::win::RegKey reg_key(HKEY_CURRENT_USER, temporary_key_.c_str(),
55 KEY_ALL_ACCESS); 55 KEY_ALL_ACCESS);
56 DCHECK(reg_key.Valid()); 56 DCHECK(reg_key.Valid());
57 reg_key.DeleteKey(L""); 57 reg_key.DeleteKey(L"");
58 58
59 scoped_ptr<base::Environment> env(base::Environment::Create()); 59 scoped_ptr<base::Environment> env(base::Environment::Create());
60 bool success = env->UnSetVar(kTestHKCUOverrideEnvironmentVariable); 60 bool success = env->UnSetVar(kTestHKCUOverrideEnvironmentVariable);
61 DCHECK(success); 61 DCHECK(success);
62 } 62 }
63 63
64 // static 64 // static
65 base::string16 IEImporterTestRegistryOverrider::GetTestRegistryOverride() { 65 base::string16 IEImporterTestRegistryOverrider::GetTestRegistryOverride() {
66 base::string16 key; 66 base::string16 key;
67 if (!GetTestKeyFromEnvironment(&key)) 67 if (!GetTestKeyFromEnvironment(&key))
68 return base::string16(); 68 return base::string16();
69 return key; 69 return key;
70 } 70 }
OLDNEW
« no previous file with comments | « chrome/common/importer/firefox_importer_utils.cc ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698