Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace.

TBR=sky

Review URL: https://codereview.chromium.org/19052005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211675 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 8 insertions, 8 deletions

diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index 2f7e473..e155906 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -143,7 +143,7 @@ void DirectoryLister::Core::Cancel() {
 
 void DirectoryLister::Core::StartInternal() {
 
-  if (!file_util::DirectoryExists(dir_)) {
+  if (!base::DirectoryExists(dir_)) {
     origin_loop_->PostTask(
         FROM_HERE,
         base::Bind(&DirectoryLister::Core::OnDone, this, ERR_FILE_NOT_FOUND));
diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc
index 1302054..6c68e66 100644
--- a/net/disk_cache/simple/simple_backend_impl.cc
+++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -33,7 +33,7 @@ using base::MessageLoopProxy;
 using base::SequencedWorkerPool;
 using base::SingleThreadTaskRunner;
 using base::Time;
-using file_util::DirectoryExists;
+using base::DirectoryExists;
 using file_util::CreateDirectory;
 
 namespace {
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index ba4b8e6..9029e01 100644
--- a/net/proxy/proxy_config_service_linux.cc
+++ b/net/proxy/proxy_config_service_linux.cc
@@ -883,7 +883,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter,
         base::FilePath kde4_path = base::FilePath(home).Append(".kde4");
         base::FilePath kde4_config = KDEHomeToConfigPath(kde4_path);
         bool use_kde4 = false;
-        if (file_util::DirectoryExists(kde4_path)) {
+        if (base::DirectoryExists(kde4_path)) {
           base::PlatformFileInfo kde3_info;
           base::PlatformFileInfo kde4_info;
           if (file_util::GetFileInfo(kde4_config, &kde4_info)) {
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 53419ab..b024e08 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -1530,7 +1530,7 @@ TEST_F(ProxyConfigServiceLinuxTest, KDEHomePicker) {
 
   // If .kde4 exists it will mess up the first test. It should not, as
   // we created the directory for $HOME in the test setup.
-  CHECK(!file_util::DirectoryExists(kde4_home_));
+  CHECK(!base::DirectoryExists(kde4_home_));
 
   { SCOPED_TRACE("KDE4, no .kde4 directory, verify fallback");
     MockEnvironment* env = new MockEnvironment;
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc
index 209b50a..30c5f67 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.cc
@@ -48,7 +48,7 @@ bool TryRelativeToDir(const base::FilePath& start_dir,
                       const base::FilePath& to_try,
                       base::FilePath* out_dir) {
   base::FilePath dir(start_dir);
-  while (!file_util::DirectoryExists(dir.Append(to_try))) {
+  while (!base::DirectoryExists(dir.Append(to_try))) {
     base::FilePath parent = dir.DirName();
     if (parent == dir) {
       // We hit the root directory.
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index 59b75f1..408dbf6 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -111,7 +111,7 @@ int main(int argc, const char* argv[]) {
     return -1;
   }
 
-  if (!file_util::DirectoryExists(test_server->document_root())) {
+  if (!base::DirectoryExists(test_server->document_root())) {
     printf("Error: invalid doc root: \"%s\" does not exist!\n",
         UTF16ToUTF8(test_server->document_root().LossyDisplayName()).c_str());
     return -1;
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index 1a70ed4..7cc1674 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -876,7 +876,7 @@ void URLFetcherFileTest::OnURLFetchComplete(const URLFetcher* source) {
     EXPECT_TRUE(source->GetResponseAsFilePath(
         take_ownership_of_file_, &file_path_));
 
-    EXPECT_TRUE(file_util::ContentsEqual(expected_file_, file_path_));
+    EXPECT_TRUE(base::ContentsEqual(expected_file_, file_path_));
   } else {
     int error_code = OK;
     EXPECT_TRUE(fetcher_->FileErrorOccurred(&error_code));
@@ -1439,7 +1439,7 @@ TEST_F(URLFetcherFileTest, OverwriteExistingFile) {
             file_util::WriteFile(file_path_, data.data(), data.size()));
   ASSERT_TRUE(base::PathExists(file_path_));
   expected_file_ = test_server.GetDocumentRoot().AppendASCII(kFileToFetch);
-  ASSERT_FALSE(file_util::ContentsEqual(file_path_, expected_file_));
+  ASSERT_FALSE(base::ContentsEqual(file_path_, expected_file_));
 
   // Get a small file.
   CreateFetcherForFile(