Clean up URL test string conversions.

url/url_util_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 <stddef.h>
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
@@ skipping 196 matching lines @@
      "pqrstuvwxyz{|}~\x7f/"},
     // Test un-UTF-8-ization.
     {"%e4%bd%a0%e5%a5%bd", "\xe4\xbd\xa0\xe5\xa5\xbd"},
   };
 
   for (size_t i = 0; i < arraysize(decode_cases); i++) {
     const char* input = decode_cases[i].input;
     RawCanonOutputT<base::char16> output;
     DecodeURLEscapeSequences(input, strlen(input), &output);
     EXPECT_EQ(decode_cases[i].output,
-              test_utils::ConvertUTF16ToUTF8(base::string16(output.data(),
-                                                            output.length())));
+              base::UTF16ToUTF8(base::string16(output.data(),
+                                               output.length())));
   }
 
   // Our decode should decode %00
   const char zero_input[] = "%00";
   RawCanonOutputT<base::char16> zero_output;
   DecodeURLEscapeSequences(zero_input, strlen(zero_input), &zero_output);
-  EXPECT_NE("%00", test_utils::ConvertUTF16ToUTF8(
+  EXPECT_NE("%00", base::UTF16ToUTF8(
       base::string16(zero_output.data(), zero_output.length())));
 
   // Test the error behavior for invalid UTF-8.
   const char invalid_input[] = "%e4%a0%e5%a5%bd";
   const base::char16 invalid_expected[4] = {0x00e4, 0x00a0, 0x597d, 0};
   RawCanonOutputT<base::char16> invalid_output;
   DecodeURLEscapeSequences(invalid_input, strlen(invalid_input),
                            &invalid_output);
   EXPECT_EQ(base::string16(invalid_expected),
             base::string16(invalid_output.data(), invalid_output.length()));
@@ skipping 175 matching lines @@
                                     << test_case.canonicalized_host << ", "
                                     << test_case.lower_ascii_domain << ")");
 
     EXPECT_EQ(
         test_case.expected_domain_is,
         DomainIs(test_case.canonicalized_host, test_case.lower_ascii_domain));
   }
 }
 
 }  // namespace url