Add base:: to string16 in rlz/.

rlz/lib/machine_id.cc

Index: rlz/lib/machine_id.cc
diff --git a/rlz/lib/machine_id.cc b/rlz/lib/machine_id.cc
index b8c10f0ef320a321dda907429e094d67d091c487..1919d02adf04d8b2f14d9c4593d6dc4660aaedd1 100644
--- a/rlz/lib/machine_id.cc
+++ b/rlz/lib/machine_id.cc
@@ -22,7 +22,7 @@ bool GetMachineId(std::string* machine_id) {
     return true;
   }
 
-  string16 sid_string;
+  base::string16 sid_string;
   int volume_id;
   if (!GetRawMachineId(&sid_string, &volume_id))
     return false;
@@ -37,7 +37,7 @@ bool GetMachineId(std::string* machine_id) {
 
 namespace testing {
 
-bool GetMachineIdImpl(const string16& sid_string,
+bool GetMachineIdImpl(const base::string16& sid_string,
                       int volume_id,
                       std::string* machine_id) {
   machine_id->clear();
@@ -52,7 +52,7 @@ bool GetMachineIdImpl(const string16& sid_string,
     // However, the chromebase SHA1 hash function takes only an std::string as
     // input, so the unicode string needs to be converted to std::string
     // "as is".
-    size_t byte_count = sid_string.size() * sizeof(string16::value_type);
+    size_t byte_count = sid_string.size() * sizeof(base::string16::value_type);
     const char* buffer = reinterpret_cast<const char*>(sid_string.c_str());
     std::string sid_string_buffer(buffer, byte_count);