Update uses of UTF conversions in chrome/common to use the base:: namespace.

chrome/common/metrics/variations/experiment_labels_unittest.cc

 // Copyright 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/common/metrics/variations/experiment_labels.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 53 matching lines @@
       base::FieldTrial::ActiveGroup group;
       group.trial_name = group_data[j];
       group.group_name = group_data[j + 1];
       groups.push_back(group);
     }
 
     // Parse the expected output.
     std::vector<std::string> expected_ids_list;
     base::SplitString(test_cases[i].expected_ids, '#', &expected_ids_list);
 
-    std::string experiment_labels_string = UTF16ToUTF8(
+    std::string experiment_labels_string = base::UTF16ToUTF8(
         BuildGoogleUpdateExperimentLabel(groups));
 
     // Split the VariationIDs from the labels for verification below.
     std::vector<std::string> split_labels;
     std::set<std::string> parsed_ids;
     base::SplitString(experiment_labels_string, ';', &split_labels);
     for (std::vector<std::string>::const_iterator it = split_labels.begin();
          it != split_labels.end(); ++it) {
       // The ID is precisely between the '=' and '|' characters in each label.
       size_t index_of_equals = it->find('=');
@@ skipping 35 matching lines @@
     {"A=B|Tue, 21 Jan 2014 15:30:21 GMT;C=D|Tue, 21 Jan 2014 15:30:21 GMT",
      "P=Q|Tue, 21 Jan 2014 15:30:21 GMT;X=Y|Tue, 21 Jan 2014 15:30:21 GMT",
      "P=Q|Tue, 21 Jan 2014 15:30:21 GMT;X=Y|Tue, 21 Jan 2014 15:30:21 GMT;"
      "A=B|Tue, 21 Jan 2014 15:30:21 GMT;C=D|Tue, 21 Jan 2014 15:30:21 GMT"},
     {"",
      "",
      ""},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
-    std::string result = UTF16ToUTF8(CombineExperimentLabels(
-        ASCIIToUTF16(test_cases[i].variations_labels),
-        ASCIIToUTF16(test_cases[i].other_labels)));
+    std::string result = base::UTF16ToUTF8(CombineExperimentLabels(
+        base::ASCIIToUTF16(test_cases[i].variations_labels),
+        base::ASCIIToUTF16(test_cases[i].other_labels)));
     EXPECT_EQ(test_cases[i].expected_label, result);
   }
 }
 
 TEST(ExperimentLabelsTest, ExtractNonVariationLabels) {
   struct {
     const char* input_label;
     const char* expected_output;
   } test_cases[] = {
     // Empty
@@ skipping 33 matching lines @@
      "gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT"},
     // Trailing semicolon
     {"gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT;"
      "CrVar1=3310002|Tue, 21 Jan 2014 15:30:21 GMT;",  // Note the semi here.
      "gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT"},
     // Semis
     {";;;;", ""},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
-    std::string non_variation_labels = UTF16ToUTF8(
-        ExtractNonVariationLabels(ASCIIToUTF16(test_cases[i].input_label)));
+    std::string non_variation_labels = base::UTF16ToUTF8(
+        ExtractNonVariationLabels(
+            base::ASCIIToUTF16(test_cases[i].input_label)));
     EXPECT_EQ(test_cases[i].expected_output, non_variation_labels);
   }
 }
 
 }  // namespace chrome_variations