[Refactor] to rename and re-layer the file_util stack layers.

webkit/fileapi/native_file_util_unittest.cc

Index: webkit/fileapi/native_file_util_unittest.cc
diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/native_file_util_unittest.cc
similarity index 88%
rename from webkit/fileapi/file_system_file_util_unittest.cc
rename to webkit/fileapi/native_file_util_unittest.cc
index afa742bfb9305a82f86cd3a02f074d0adc360b9f..cf429cc2d7885edabef06a1e79e5bf795afd3e56 100644
--- a/webkit/fileapi/file_system_file_util_unittest.cc
+++ b/webkit/fileapi/native_file_util_unittest.cc
@@ -11,7 +11,8 @@
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_test_helper.h"
-#include "webkit/fileapi/obfuscated_file_system_file_util.h"
+#include "webkit/fileapi/native_file_util.h"
+#include "webkit/fileapi/obfuscated_file_util.h"
 
 using namespace fileapi;
 
@@ -46,17 +47,17 @@ const CopyMoveTestCaseRecord kCopyMoveTestCases[] = {
 
 }  // namespace (anonymous)
 
-// This is not yet a full unit test for FileSystemFileUtil.  TODO(ericu): Adapt
+// This is not yet a full unit test for NativeFileUtil.  TODO(ericu): Adapt
 // the other subclasses' unit tests, as mentioned in the comments in
-// ObfuscatedFileSystemFileUtil's unit test.
+// ObfuscatedFileUtil's unit test.
 // Currently this is just a test of cross-filesystem copy and move, which
-// actually exercises subclasses of FileSystemFileUtil as well as the class
+// actually exercises subclasses of NativeFileUtil as well as the class
 // itself.  We currently only test copies between obfuscated filesystems.
 // TODO(ericu): Add a test for copying between obfuscated and local filesystems,
 // and between different local filesystems.
-class FileSystemFileUtilTest : public testing::Test {
+class NativeFileUtilTest : public testing::Test {
  public:
-  FileSystemFileUtilTest() {
+  NativeFileUtilTest() {
   }
 
   void SetUp() {
@@ -73,9 +74,8 @@ class FileSystemFileUtilTest : public testing::Test {
       bool copy) {
     ScopedTempDir base_dir;
     ASSERT_TRUE(base_dir.CreateUniqueTempDir());
-    scoped_refptr<ObfuscatedFileSystemFileUtil> file_util(
-        new ObfuscatedFileSystemFileUtil(base_dir.path(),
-                                         new FileSystemFileUtil()));
+    scoped_refptr<ObfuscatedFileUtil> file_util(
+        new ObfuscatedFileUtil(base_dir.path(), new NativeFileUtil()));
     FileSystemTestOriginHelper src_helper(src_origin, src_type);
     src_helper.SetUp(base_dir.path(),
                      false,  // incognito
@@ -111,8 +111,8 @@ class FileSystemFileUtilTest : public testing::Test {
     FileSystemContext* file_system_context = dest_helper.file_system_context();
     scoped_ptr<FileSystemOperationContext> copy_context(
         new FileSystemOperationContext(file_system_context, NULL));
-    copy_context->set_src_file_system_file_util(file_util);
-    copy_context->set_dest_file_system_file_util(file_util);
+    copy_context->set_src_file_util(file_util);
+    copy_context->set_dest_file_util(file_util);
     copy_context->set_src_origin_url(src_helper.origin());
     copy_context->set_dest_origin_url(dest_helper.origin());
     copy_context->set_src_type(src_helper.type());
@@ -168,10 +168,10 @@ class FileSystemFileUtilTest : public testing::Test {
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(FileSystemFileUtilTest);
+  DISALLOW_COPY_AND_ASSIGN(NativeFileUtilTest);
 };
 
-TEST_F(FileSystemFileUtilTest, TestCrossFileSystemCopyDifferentOrigins) {
+TEST_F(NativeFileUtilTest, TestCrossFileSystemCopyDifferentOrigins) {
   GURL src_origin("http://www.example.com");
   fileapi::FileSystemType type = kFileSystemTypePersistent;
   GURL dest_origin("http://www.not.the.same.domain.com");
@@ -179,7 +179,7 @@ TEST_F(FileSystemFileUtilTest, TestCrossFileSystemCopyDifferentOrigins) {
   TestCrossFileSystemCopyMoveHelper(src_origin, type, dest_origin, type, true);
 }
 
-TEST_F(FileSystemFileUtilTest, TestCrossFileSystemCopySameOrigin) {
+TEST_F(NativeFileUtilTest, TestCrossFileSystemCopySameOrigin) {
   GURL origin("http://www.example.com");
   fileapi::FileSystemType src_type = kFileSystemTypePersistent;
   fileapi::FileSystemType dest_type = kFileSystemTypeTemporary;
@@ -187,7 +187,7 @@ TEST_F(FileSystemFileUtilTest, TestCrossFileSystemCopySameOrigin) {
   TestCrossFileSystemCopyMoveHelper(origin, src_type, origin, dest_type, true);
 }
 
-TEST_F(FileSystemFileUtilTest, TestCrossFileSystemMoveDifferentOrigins) {
+TEST_F(NativeFileUtilTest, TestCrossFileSystemMoveDifferentOrigins) {
   GURL src_origin("http://www.example.com");
   fileapi::FileSystemType type = kFileSystemTypePersistent;
   GURL dest_origin("http://www.not.the.same.domain.com");
@@ -195,7 +195,7 @@ TEST_F(FileSystemFileUtilTest, TestCrossFileSystemMoveDifferentOrigins) {
   TestCrossFileSystemCopyMoveHelper(src_origin, type, dest_origin, type, false);
 }
 
-TEST_F(FileSystemFileUtilTest, TestCrossFileSystemMoveSameOrigin) {
+TEST_F(NativeFileUtilTest, TestCrossFileSystemMoveSameOrigin) {
   GURL origin("http://www.example.com");
   fileapi::FileSystemType src_type = kFileSystemTypePersistent;
   fileapi::FileSystemType dest_type = kFileSystemTypeTemporary;