3 files changed, 6 insertions, 6 deletions
diff --git a/rlz/lib/machine_id.cc b/rlz/lib/machine_id.cc
index b8c10f0..1919d02 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);
 
diff --git a/rlz/lib/machine_id.h b/rlz/lib/machine_id.h
index af58c8e..312f669 100644
--- a/rlz/lib/machine_id.h
+++ b/rlz/lib/machine_id.h
@@ -21,10 +21,10 @@ bool GetMachineId(std::string* machine_id);
 // Retrieves a raw machine identifier string and a machine-specific
 // 4 byte value. GetMachineId() will SHA1 |data|, append |more_data|, compute
 // the Crc8 of that, and return a hex-encoded string of that data.
-bool GetRawMachineId(string16* data, int* more_data);
+bool GetRawMachineId(base::string16* data, int* more_data);
 
 namespace testing {
-bool GetMachineIdImpl(const string16& sid_string,
+bool GetMachineIdImpl(const base::string16& sid_string,
                       int volume_id,
                       std::string* machine_id);
 }  // namespace testing
diff --git a/rlz/lib/machine_id_unittest.cc b/rlz/lib/machine_id_unittest.cc
index c01e9be..bcae511 100644
--- a/rlz/lib/machine_id_unittest.cc
+++ b/rlz/lib/machine_id_unittest.cc
@@ -11,7 +11,7 @@
 
 // This test will fail if the behavior of GetMachineId changes.
 TEST(MachineDealCodeTestMachineId, MachineId) {
-  string16 computer_sid(UTF8ToUTF16(
+  base::string16 computer_sid(UTF8ToUTF16(
         "S-1-5-21-2345599882-2448789067-1921365677"));
   std::string id;
   rlz_lib::testing::GetMachineIdImpl(computer_sid, 2651229008, &id);