Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media…

net/base/escape_unittest.cc

Index: net/base/escape_unittest.cc
diff --git a/net/base/escape_unittest.cc b/net/base/escape_unittest.cc
index e7e435c08ef0c0877238a248ac085eaf77d38c3a..90c246a38abc7773d4a28d48c00b6f99d3b39eb2 100644
--- a/net/base/escape_unittest.cc
+++ b/net/base/escape_unittest.cc
@@ -250,28 +250,28 @@ TEST(EscapeTest, UnescapeURLComponent) {
   };
 
   for (size_t i = 0; i < arraysize(unescape_cases); i++) {
-    base::string16 str(WideToUTF16(unescape_cases[i].input));
-    EXPECT_EQ(WideToUTF16(unescape_cases[i].output),
+    base::string16 str(base::WideToUTF16(unescape_cases[i].input));
+    EXPECT_EQ(base::WideToUTF16(unescape_cases[i].output),
               UnescapeURLComponent(str, unescape_cases[i].rules));
   }
 
   // Test the NULL character unescaping (which wouldn't work above since those
   // are just char pointers).
-  base::string16 input(WideToUTF16(L"Null"));
+  base::string16 input(base::WideToUTF16(L"Null"));
   input.push_back(0);  // Also have a NULL in the input.
-  input.append(WideToUTF16(L"%00%39Test"));
+  input.append(base::WideToUTF16(L"%00%39Test"));
 
   // When we're unescaping NULLs
-  base::string16 expected(WideToUTF16(L"Null"));
+  base::string16 expected(base::WideToUTF16(L"Null"));
   expected.push_back(0);
   expected.push_back(0);
-  expected.append(ASCIIToUTF16("9Test"));
+  expected.append(base::ASCIIToUTF16("9Test"));
   EXPECT_EQ(expected, UnescapeURLComponent(input, UnescapeRule::CONTROL_CHARS));
 
   // When we're not unescaping NULLs.
-  expected = WideToUTF16(L"Null");
+  expected = base::WideToUTF16(L"Null");
   expected.push_back(0);
-  expected.append(WideToUTF16(L"%009Test"));
+  expected.append(base::WideToUTF16(L"%009Test"));
   EXPECT_EQ(expected, UnescapeURLComponent(input, UnescapeRule::NORMAL));
 }
 
@@ -331,7 +331,7 @@ TEST(EscapeTest, UnescapeAndDecodeUTF8URLComponent) {
     // TODO: Need to test unescape_spaces and unescape_percent.
     base::string16 decoded = UnescapeAndDecodeUTF8URLComponent(
         unescape_cases[i].input, UnescapeRule::NORMAL, NULL);
-    EXPECT_EQ(WideToUTF16(unescape_cases[i].decoded), decoded);
+    EXPECT_EQ(base::WideToUTF16(unescape_cases[i].decoded), decoded);
   }
 }
 
@@ -387,8 +387,8 @@ TEST(EscapeTest, UnescapeForHTML) {
     { "&amp; &", "& &" },
   };
   for (size_t i = 0; i < arraysize(tests); ++i) {
-    base::string16 result = UnescapeForHTML(ASCIIToUTF16(tests[i].input));
-    EXPECT_EQ(ASCIIToUTF16(tests[i].expected_output), result);
+    base::string16 result = UnescapeForHTML(base::ASCIIToUTF16(tests[i].input));
+    EXPECT_EQ(base::ASCIIToUTF16(tests[i].expected_output), result);
   }
 }