Add base:: to string16s in chrome/.

chrome/test/chromedriver/util.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/util.h"
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 11 matching lines @@
 #include "chrome/test/chromedriver/key_converter.h"
 
 std::string GenerateId() {
   uint64 msb = base::RandUint64();
   uint64 lsb = base::RandUint64();
   return base::StringPrintf("%016" PRIx64 "%016" PRIx64, msb, lsb);
 }
 
 namespace {
 
-Status FlattenStringArray(const base::ListValue* src, string16* dest) {
-  string16 keys;
+Status FlattenStringArray(const base::ListValue* src, base::string16* dest) {
+  base::string16 keys;
   for (size_t i = 0; i < src->GetSize(); ++i) {
-    string16 keys_list_part;
+    base::string16 keys_list_part;
     if (!src->GetString(i, &keys_list_part))
       return Status(kUnknownError, "keys should be a string");
     for (size_t j = 0; j < keys_list_part.size(); ++j) {
       if (CBU16_IS_SURROGATE(keys_list_part[j])) {
         return Status(kUnknownError,
                       "ChromeDriver only supports characters in the BMP");
       }
     }
     keys.append(keys_list_part);
   }
   *dest = keys;
   return Status(kOk);
 }
 
 }  // namespace
 
 Status SendKeysOnWindow(
     WebView* web_view,
     const base::ListValue* key_list,
     bool release_modifiers,
     int* sticky_modifiers) {
-  string16 keys;
+  base::string16 keys;
   Status status = FlattenStringArray(key_list, &keys);
   if (status.IsError())
     return status;
   std::list<KeyEvent> events;
   int sticky_modifiers_tmp = *sticky_modifiers;
   status = ConvertKeysToKeyEvents(
       keys, release_modifiers, &sticky_modifiers_tmp, &events);
   if (status.IsError())
     return status;
   status = web_view->DispatchKeyEvents(events);
@@ skipping 326 matching lines @@
   if (first_file.empty())
     return Status(kUnknownError, "contained 0 files");
 
   base::FilePath second_file = enumerator.Next();
   if (!second_file.empty())
     return Status(kUnknownError, "contained multiple files");
 
   *file = first_file;
   return Status(kOk);
 }