Move Copy* into the base namespace.

chrome/browser/chromeos/drive/file_cache.cc

Index: chrome/browser/chromeos/drive/file_cache.cc
diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc
index 2fbce2179750379950e7393a90a7295bcb260440..7b4f94b6d8447a90fa082a27d87064790972f6d6 100644
--- a/chrome/browser/chromeos/drive/file_cache.cc
+++ b/chrome/browser/chromeos/drive/file_cache.cc
@@ -90,10 +90,11 @@ bool MoveFile(const base::FilePath& source_path,
   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;
@@ -683,7 +684,7 @@ FileError FileCache::StoreInternal(const std::string& resource_id,
       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();