Move file_util_proxy to base/files.
BUG=
Review URL: https://codereview.chromium.org/12035111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178952 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: cf7405ff9dd49a6adf3c481f3cb439184bcc7f80
diff --git a/base/base.gyp b/base/base.gyp
index f963cc2..8bc6378 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -436,10 +436,10 @@
'debug/trace_event_win_unittest.cc',
'environment_unittest.cc',
'file_path_unittest.cc',
- 'file_util_proxy_unittest.cc',
'file_util_unittest.cc',
'file_version_info_unittest.cc',
'files/dir_reader_posix_unittest.cc',
+ 'files/file_util_proxy_unittest.cc',
'files/important_file_writer_unittest.cc',
'files/scoped_temp_dir_unittest.cc',
'gmock_unittest.cc',
diff --git a/base/base.gypi b/base/base.gypi
index b0d39a7..189e776 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -149,8 +149,6 @@
'file_util_mac.mm',
'file_util_posix.cc',
'file_util_win.cc',
- 'file_util_proxy.cc',
- 'file_util_proxy.h',
'file_version_info.h',
'file_version_info_mac.h',
'file_version_info_mac.mm',
@@ -165,6 +163,8 @@
'files/file_path_watcher_linux.cc',
'files/file_path_watcher_stub.cc',
'files/file_path_watcher_win.cc',
+ 'files/file_util_proxy.cc',
+ 'files/file_util_proxy.h',
'files/important_file_writer.h',
'files/important_file_writer.cc',
'files/scoped_temp_dir.cc',
diff --git a/base/file_util_proxy.cc b/base/files/file_util_proxy.cc
similarity index 99%
rename from base/file_util_proxy.cc
rename to base/files/file_util_proxy.cc
index 1f1ab81..f18d52b 100644
--- a/base/file_util_proxy.cc
+++ b/base/files/file_util_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/file_util_proxy.h"
+#include "base/files/file_util_proxy.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
diff --git a/base/file_util_proxy.h b/base/files/file_util_proxy.h
similarity index 98%
rename from base/file_util_proxy.h
rename to base/files/file_util_proxy.h
index c3e60a3..8cbdfcb 100644
--- a/base/file_util_proxy.h
+++ b/base/files/file_util_proxy.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_FILE_UTIL_PROXY_H_
-#define BASE_FILE_UTIL_PROXY_H_
+#ifndef BASE_FILES_FILE_UTIL_PROXY_H_
+#define BASE_FILES_FILE_UTIL_PROXY_H_
#include "base/base_export.h"
#include "base/callback_forward.h"
@@ -208,4 +208,4 @@
} // namespace base
-#endif // BASE_FILE_UTIL_PROXY_H_
+#endif // BASE_FILES_FILE_UTIL_PROXY_H_
diff --git a/base/file_util_proxy_unittest.cc b/base/files/file_util_proxy_unittest.cc
similarity index 99%
rename from base/file_util_proxy_unittest.cc
rename to base/files/file_util_proxy_unittest.cc
index db215f0..447c43b 100644
--- a/base/file_util_proxy_unittest.cc
+++ b/base/files/file_util_proxy_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/file_util_proxy.h"
+#include "base/files/file_util_proxy.h"
#include <map>