summaryrefslogtreecommitdiffstats
path: root/rlz/test
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 18:47:48 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 18:47:48 +0000
commite7d6293bf36c2e3c23c5789530ccfb4b99332daa (patch)
tree52f2d8bb629faf44a14364d881800bb67d8409bc /rlz/test
parent737087635548b4632b2959198ecabd8969a6d054 (diff)
downloadchromium_src-e7d6293bf36c2e3c23c5789530ccfb4b99332daa.zip
chromium_src-e7d6293bf36c2e3c23c5789530ccfb4b99332daa.tar.gz
chromium_src-e7d6293bf36c2e3c23c5789530ccfb4b99332daa.tar.bz2
Add base:: to string16 in rlz/.
R=rogerta@chromium.org BUG=329295 Review URL: https://codereview.chromium.org/102833007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz/test')
-rw-r--r--rlz/test/rlz_test_helpers.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc
index af08836..d8b999f 100644
--- a/rlz/test/rlz_test_helpers.cc
+++ b/rlz/test/rlz_test_helpers.cc
@@ -33,14 +33,14 @@ const wchar_t kHKLMAccessProviders[] =
L"System\\CurrentControlSet\\Control\\Lsa\\AccessProviders";
struct RegistryValue {
- string16 name;
+ base::string16 name;
DWORD type;
std::vector<uint8> data;
};
struct RegistryKeyData {
std::vector<RegistryValue> values;
- std::map<string16, RegistryKeyData> keys;
+ std::map<base::string16, RegistryKeyData> keys;
};
void ReadRegistryTree(const base::win::RegKey& src, RegistryKeyData* data) {
@@ -63,7 +63,7 @@ void ReadRegistryTree(const base::win::RegKey& src, RegistryKeyData* data) {
for (base::win::RegistryKeyIterator i(src.Handle(), L"");
i.Valid(); ++i) {
ReadRegistryTree(base::win::RegKey(src.Handle(), i.Name(), KEY_READ),
- &data->keys[string16(i.Name())]);
+ &data->keys[base::string16(i.Name())]);
}
}
@@ -78,7 +78,7 @@ void WriteRegistryTree(const RegistryKeyData& data, base::win::RegKey* dest) {
}
// Next write values recursively.
- for (std::map<string16, RegistryKeyData>::const_iterator iter =
+ for (std::map<base::string16, RegistryKeyData>::const_iterator iter =
data.keys.begin();
iter != data.keys.end(); ++iter) {
WriteRegistryTree(iter->second,