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

content/browser/webui/web_ui_data_source_unittest.cc

Index: content/browser/webui/web_ui_data_source_unittest.cc
diff --git a/content/browser/webui/web_ui_data_source_unittest.cc b/content/browser/webui/web_ui_data_source_unittest.cc
index a5da7eb8211461336ebb95a2a671946e1fc98f23..4dc9c81767171b028a7f0bf6672a87b78fe6c3d9 100644
--- a/content/browser/webui/web_ui_data_source_unittest.cc
+++ b/content/browser/webui/web_ui_data_source_unittest.cc
@@ -27,7 +27,7 @@ class TestClient : public TestContentClient {
 
   virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE {
     if (message_id == kDummyStringId)
-      return UTF8ToUTF16(kDummyString);
+      return base::UTF8ToUTF16(kDummyString);
     return base::string16();
 
   }
@@ -100,7 +100,7 @@ TEST_F(WebUIDataSourceTest, EmptyStrings) {
 
 TEST_F(WebUIDataSourceTest, SomeStrings) {
   source()->SetJsonPath("strings.js");
-  source()->AddString("planet", ASCIIToUTF16("pluto"));
+  source()->AddString("planet", base::ASCIIToUTF16("pluto"));
   source()->AddLocalizedString("button", kDummyStringId);
   StartDataRequest("strings.js");
   std::string result(reinterpret_cast<const char*>(