Add base:: to string16 in rlz/.

rlz/test/rlz_test_helpers.cc

Index: rlz/test/rlz_test_helpers.cc
diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc
index af08836f9bba3b1a1e55dbd83792fc7c73c566d0..d8b999f1f739cf9484a0c8f9dfdf0d416d780719 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,