Move Copy* into the base namespace.

chrome/browser/chromeos/drive/file_cache.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/browser/chromeos/drive/file_cache.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 72 matching lines @@
               const base::FilePath& dest_path) {
   if (!base::Move(source_path, dest_path)) {
     LOG(ERROR) << "Failed to move " << source_path.value()
                << " to " << dest_path.value();
     return false;
   }
   DVLOG(1) << "Moved " << source_path.value() << " to " << dest_path.value();
   return true;
 }
 
-// Copies the file.
-bool CopyFile(const base::FilePath& source_path,
-              const base::FilePath& dest_path) {
-  if (!file_util::CopyFile(source_path, dest_path)) {
+// Copies the file. Note this isn't called CopyFile which collides with
+// base::CopyFile when doing argument-dependent name lookup.
+bool CopyFileWrapper(const base::FilePath& source_path,

[brettw, 2013/07/01 21:52:56]

Note: non-search-and-replace change here.

+                     const base::FilePath& dest_path) {
+  if (!base::CopyFile(source_path, dest_path)) {
     LOG(ERROR) << "Failed to copy " << source_path.value()
                << " to " << dest_path.value();
     return false;
   }
   DVLOG(1) << "Copied " << source_path.value() << " to " << dest_path.value();
   return true;
 }
 
 // Deletes all files that match |path_to_delete_pattern| except for
 // |path_to_keep| on blocking pool.
@@ skipping 569 matching lines @@
     return FILE_ERROR_IN_USE;
 
   base::FilePath dest_path = GetCacheFilePath(resource_id, md5,
                                               CACHED_FILE_FROM_SERVER);
   bool success = false;
   switch (file_operation_type) {
     case FILE_OPERATION_MOVE:
       success = MoveFile(source_path, dest_path);
       break;
     case FILE_OPERATION_COPY:
-      success = CopyFile(source_path, dest_path);
+      success = CopyFileWrapper(source_path, dest_path);
       break;
     default:
       NOTREACHED();
   }
 
   // Determine search pattern for stale filenames corresponding to resource_id,
   // either "<resource_id>*" or "<resource_id>.*".
   base::FilePath stale_filenames_pattern;
   if (md5.empty()) {
     // No md5 means no extension, append '*' after base name, i.e.
@@ skipping 134 matching lines @@
     }
   }
 
   // Delete old DB.
   base::Delete(old_db_path, true /* recursive */ );
   return imported;
 }
 
 }  // namespace internal
 }  // namespace drive