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

content/renderer/android/phone_number_detector_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 "content/renderer/android/phone_number_detector.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class PhoneNumberDetectorTest : public testing::Test {
  public:
   static std::string FindNumber(const std::string& content,
                                 const std::string& region) {
-    base::string16 content_16 = UTF8ToUTF16(content);
+    base::string16 content_16 = base::UTF8ToUTF16(content);
     base::string16 result_16;
     size_t start, end;
     PhoneNumberDetector detector(region);
     std::string content_text;
     if (detector.FindContent(content_16.begin(), content_16.end(),
                              &start, &end, &content_text))
          result_16 = content_16.substr(start, end - start);
-    return UTF16ToUTF8(result_16);
+    return base::UTF16ToUTF8(result_16);
   }
 
   static std::string FindAndFormatNumber(const std::string& content,
                                          const std::string& region) {
-    base::string16 content_16 = UTF8ToUTF16(content);
+    base::string16 content_16 = base::UTF8ToUTF16(content);
     base::string16 result_16;
     size_t start, end;
     PhoneNumberDetector detector(region);
     std::string content_text;
     detector.FindContent(content_16.begin(), content_16.end(),
                          &start, &end, &content_text);
     return content_text;
   }
 };
 
@@ skipping 27 matching lines @@
   // "+1 (650) 333-6000" using fullwidth UTF-8 characters.
   EXPECT_EQ("+16503336000", FindAndFormatNumber(
             "\xEF\xBC\x8B\xEF\xBC\x91\xE3\x80\x80\xEF\xBC\x88"
             "\xEF\xBC\x96\xEF\xBC\x95\xEF\xBC\x90\xEF\xBC\x89"
             "\xE3\x80\x80\xEF\xBC\x93\xEF\xBC\x93\xEF\xBC\x93"
             "\xE3\x83\xBC\xEF\xBC\x96\xEF\xBC\x90\xEF\xBC\x90"
             "\xEF\xBC\x90", "us"));
 }
 
 }  // namespace content