Move AppendFile and *CurrentDirectory to the base namespace.

chrome/common/net/url_fixer_upper.cc

 // Copyright (c) 2012 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 "chrome/common/net/url_fixer_upper.h"
 
 #include <algorithm>
 
 #if defined(OS_POSIX)
 #include "base/environment.h"
@@ skipping 567 matching lines @@
 // The rules are different here than for regular fixup, since we need to handle
 // input like "hello.html" and know to look in the current directory.  Regular
 // fixup will look for cues that it is actually a file path before trying to
 // figure out what file it is.  If our logic doesn't work, we will fall back on
 // regular fixup.
 GURL URLFixerUpper::FixupRelativeFile(const base::FilePath& base_dir,
                                       const base::FilePath& text) {
   base::FilePath old_cur_directory;
   if (!base_dir.empty()) {
     // Save the old current directory before we move to the new one.
-    file_util::GetCurrentDirectory(&old_cur_directory);
-    file_util::SetCurrentDirectory(base_dir);
+    base::GetCurrentDirectory(&old_cur_directory);
+    base::SetCurrentDirectory(base_dir);
   }
 
   // Allow funny input with extra whitespace and the wrong kind of slashes.
   base::FilePath::StringType trimmed;
   PrepareStringForFileOps(text, &trimmed);
 
   bool is_file = true;
   // Avoid recognizing definite non-file URLs as file paths.
   GURL gurl(trimmed);
   if (gurl.is_valid() && gurl.IsStandard())
@@ skipping 12 matching lines @@
         trimmed,
         net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS);
 #endif
 
     if (!ValidPathForFile(unescaped, &full_path))
       is_file = false;
   }
 
   // Put back the current directory if we saved it.
   if (!base_dir.empty())
-    file_util::SetCurrentDirectory(old_cur_directory);
+    base::SetCurrentDirectory(old_cur_directory);
 
   if (is_file) {
     GURL file_url = net::FilePathToFileURL(full_path);
     if (file_url.is_valid())
       return GURL(base::UTF16ToUTF8(net::FormatUrl(file_url, std::string(),
           net::kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL, NULL,
           NULL, NULL)));
     // Invalid files fall through to regular processing.
   }
 
@@ skipping 11 matching lines @@
 
   if (part->is_valid()) {
     // Offset the location of this component.
     part->begin += offset;
 
     // This part might not have existed in the original text.
     if (part->begin < 0)
       part->reset();
   }
 }