Revert 184352

chrome/browser/net/url_fixer_upper_unittest.cc

Index: chrome/browser/net/url_fixer_upper_unittest.cc
===================================================================
--- chrome/browser/net/url_fixer_upper_unittest.cc	(revision 184354)
+++ chrome/browser/net/url_fixer_upper_unittest.cc	(working copy)
@@ -366,7 +366,7 @@
 
   // c:\foo\bar.txt -> file:///c:/foo/bar.txt (basic)
 #if defined(OS_WIN)
-  GURL fixedup(URLFixerUpper::FixupURL(base::WideToUTF8(original.value()),
+  GURL fixedup(URLFixerUpper::FixupURL(WideToUTF8(original.value()),
                                        std::string()));
 #elif defined(OS_POSIX)
   GURL fixedup(URLFixerUpper::FixupURL(original.value(), std::string()));
@@ -376,7 +376,7 @@
   // TODO(port): Make some equivalent tests for posix.
 #if defined(OS_WIN)
   // c|/foo\bar.txt -> file:///c:/foo/bar.txt (pipe allowed instead of colon)
-  std::string cur(base::WideToUTF8(original.value()));
+  std::string cur(WideToUTF8(original.value()));
   EXPECT_EQ(':', cur[1]);
   cur[1] = '|';
   EXPECT_EQ(golden, URLFixerUpper::FixupURL(cur, std::string()));
@@ -461,7 +461,7 @@
   for (size_t i = 0; i < arraysize(fixup_cases); ++i) {
     fixup_case value = fixup_cases[i];
 #if defined(OS_WIN)
-    base::FilePath input(base::UTF8ToWide(value.input));
+    base::FilePath input(UTF8ToWide(value.input));
 #elif defined(OS_POSIX)
     base::FilePath input(value.input);
 #endif