Convert string16 -> base::string16 in components/

components/autofill/browser/autofill_merge_unittest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 32 matching lines @@
 };
 
 // Serializes the |profiles| into a string.
 std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
   std::string result;
   for (size_t i = 0; i < profiles.size(); ++i) {
     result += kProfileSeparator;
     result += "\n";
     for (size_t j = 0; j < arraysize(kProfileFieldTypes); ++j) {
       AutofillFieldType type = kProfileFieldTypes[j];
-      std::vector<string16> values;
+      std::vector<base::string16> values;
       profiles[i]->GetRawMultiInfo(type, &values);
       for (size_t k = 0; k < values.size(); ++k) {
         result += AutofillType::FieldTypeToString(type);
         result += kFieldSeparator;
         result += UTF16ToUTF8(values[k]);
         result += "\n";
       }
     }
   }
 
@@ skipping 102 matching lines @@
   // Parse the input line by line.
   std::vector<std::string> lines;
   Tokenize(profiles, "\n", &lines);
   for (size_t i = 0; i < lines.size(); ++i) {
     std::string line = lines[i];
 
     if (line != kProfileSeparator) {
       // Add a field to the current profile.
       size_t separator_pos = line.find(kFieldSeparator);
       ASSERT_NE(std::string::npos, separator_pos);
-      string16 field_type = UTF8ToUTF16(line.substr(0, separator_pos));
-      string16 value = UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
+      base::string16 field_type = UTF8ToUTF16(line.substr(0, separator_pos));
+      base::string16 value =
+          UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
 
       FormFieldData field;
       field.label = field_type;
       field.name = field_type;
       field.value = value;
       field.form_control_type = "text";
       form.fields.push_back(field);
     }
 
     // The first line is always a profile separator, and the last profile is not
@@ skipping 21 matching lines @@
     }
   }
 
   *merged_profiles = SerializeProfiles(personal_data_.web_profiles());
 }
 
 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }