Move the rest of test_file_util to base namespace.

base/test/test_file_util.h

 // 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.
 
 #ifndef BASE_TEST_TEST_FILE_UTIL_H_
 #define BASE_TEST_TEST_FILE_UTIL_H_
 
 // File utility functions used only by tests.
 
 #include <string>
@@ skipping 29 matching lines @@
 // Returns true if the volume supports Alternate Data Streams.
 bool VolumeSupportsADS(const FilePath& path);
 
 // Returns true if the ZoneIdentifier is correctly set to "Internet" (3).
 // Note that this function must be called from the same process as
 // the one that set the zone identifier.  I.e. don't use it in UI/automation
 // based tests.
 bool HasInternetZoneIdentifier(const FilePath& full_path);
 #endif  // defined(OS_WIN)
 
-}  // namespace base
-
-// TODO(brettw) move all of this to the base namespace.
-namespace file_util {
-
 // For testing, make the file unreadable or unwritable.
 // In POSIX, this does not apply to the root user.
-bool MakeFileUnreadable(const base::FilePath& path) WARN_UNUSED_RESULT;
-bool MakeFileUnwritable(const base::FilePath& path) WARN_UNUSED_RESULT;
+bool MakeFileUnreadable(const FilePath& path) WARN_UNUSED_RESULT;
+bool MakeFileUnwritable(const FilePath& path) WARN_UNUSED_RESULT;
+
+// Saves the current permissions for a path, and restores it on destruction.
+class FilePermissionRestorer {
+ public:
+  explicit FilePermissionRestorer(const FilePath& path);
+  ~FilePermissionRestorer();
+
+ private:
+  const FilePath path_;
+  void* info_;  // The opaque stored permission information.
+  size_t length_;  // The length of the stored permission information.
+
+  DISALLOW_COPY_AND_ASSIGN(FilePermissionRestorer);
+};
 
 #if defined(OS_ANDROID)
 // Register the ContentUriTestUrils JNI bindings.
 bool RegisterContentUriTestUtils(JNIEnv* env);
 
 // Insert an image file into the MediaStore, and retrieve the content URI for
 // testing purpose.
-base::FilePath InsertImageIntoMediaStore(const base::FilePath& path);
+FilePath InsertImageIntoMediaStore(const FilePath& path);
 #endif  // defined(OS_ANDROID)
 
-// Saves the current permissions for a path, and restores it on destruction.
-class PermissionRestorer {
- public:
-  explicit PermissionRestorer(const base::FilePath& path);
-  ~PermissionRestorer();
-
- private:
-  const base::FilePath path_;
-  void* info_;  // The opaque stored permission information.
-  size_t length_;  // The length of the stored permission information.
-
-  DISALLOW_COPY_AND_ASSIGN(PermissionRestorer);
-};
-
-}  // namespace file_util
+}  // namespace base
 
 #endif  // BASE_TEST_TEST_FILE_UTIL_H_