Modify the headers in src/ to forward to url/*.h

src/url_test_utils.h

Index: src/url_test_utils.h
diff --git a/src/url_test_utils.h b/src/url_test_utils.h
index 6278e3fbb1c94f1a5c956d8d5cba30bec8dad719..fa30ff15e894fc30735f952cfb895414d52a6690 100644
--- a/src/url_test_utils.h
+++ b/src/url_test_utils.h
@@ -33,46 +33,6 @@
 #ifndef GOOGLEURL_SRC_URL_TEST_UTILS_H__
 #define GOOGLEURL_SRC_URL_TEST_UTILS_H__
 
-#include <string>
-
-#include "base/string16.h"
-#include "googleurl/src/url_canon_internal.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace url_test_utils {
-
-// Converts a UTF-16 string from native wchar_t format to char16, by
-// truncating the high 32 bits.  This is not meant to handle true UTF-32
-// encoded strings.
-inline string16 WStringToUTF16(const wchar_t* src) {
-  string16 str;
-  int length = static_cast<int>(wcslen(src));
-  for (int i = 0; i < length; ++i) {
-    str.push_back(static_cast<char16>(src[i]));
-  }
-  return str;
-}
-
-// Converts a string from UTF-8 to UTF-16
-inline string16 ConvertUTF8ToUTF16(const std::string& src) {
-  int length = static_cast<int>(src.length());
-  EXPECT_LT(length, 1024);
-  url_canon::RawCanonOutputW<1024> output;
-  EXPECT_TRUE(url_canon::ConvertUTF8ToUTF16(src.data(), length, &output));
-  return string16(output.data(), output.length());
-}
-
-// Converts a string from UTF-16 to UTF-8
-inline std::string ConvertUTF16ToUTF8(const string16& src) {
-  std::string str;
-  url_canon::StdStringCanonOutput output(&str);
-  EXPECT_TRUE(url_canon::ConvertUTF16ToUTF8(src.data(),
-                                            static_cast<int>(src.length()),
-                                            &output));
-  output.Complete();
-  return str;
-}
-
-}  // namespace url_test_utils
+#include "url/url_test_utils.h"
 
 #endif  // GOOGLEURL_SRC_URL_TEST_UTILS_H__