Cleanup: Move more recursive operation logic from FileUtilHelper to FileUtil

webkit/fileapi/media/native_media_file_util_unittest.cc

 // 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.
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
+#include "base/location.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/fileapi/media/native_media_file_util.h"
 #include "webkit/fileapi/mock_file_system_options.h"
@@ skipping 21 matching lines @@
   { FPL("piyo.txt"), true, true },
   { FPL("moga.cod"), true, true },
 
   // File should be visible if it's a supported media file.
   { FPL("foo"), false, false },  // File without extension.
   { FPL("bar.jpg"), false, true },  // Supported media file.
   { FPL("baz.txt"), false, false },  // Non-media file.
   { FPL("foobar.cod"), false, false },  // Unsupported media file.
 };
 
-void ExpectEqHelper(const std::string& test_name,
+void ExpectEqHelper(const tracked_objects::Location& location,
+                    const std::string& test_name,
                     base::PlatformFileError expected,
                     base::PlatformFileError actual) {
-  EXPECT_EQ(expected, actual) << test_name;
+  EXPECT_EQ(expected, actual) << location.ToString() << ": " << test_name;
 }
 
 void ExpectMetadataEqHelper(const std::string& test_name,
                             base::PlatformFileError expected,
                             bool expected_is_directory,
                             base::PlatformFileError actual,
                             const base::PlatformFileInfo& file_info,
                             const FilePath& /*platform_path*/) {
   EXPECT_EQ(expected, actual) << test_name;
   if (actual == base::PLATFORM_FILE_OK)
@@ skipping 117 matching lines @@
 
     base::PlatformFileError expectation =
         kFilteringTestCases[i].visible ?
         base::PLATFORM_FILE_OK :
         base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
     std::string test_name =
         base::StringPrintf("DirectoryExistsAndFileExistsFiltering %" PRIuS, i);
     if (kFilteringTestCases[i].is_directory) {
       operation->DirectoryExists(
-          url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, base::Bind(&ExpectEqHelper, FROM_HERE, test_name, expectation));
     } else {
       operation->FileExists(
-          url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, base::Bind(&ExpectEqHelper, FROM_HERE, test_name, expectation));
     }
     MessageLoop::current()->RunUntilIdle();
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, ReadDirectoryFiltering) {
   PopulateDirectoryWithTestCases(root_path(),
                                  kFilteringTestCases,
                                  arraysize(kFilteringTestCases));
 
@@ skipping 28 matching lines @@
       std::string test_name = base::StringPrintf(
           "CreateFileAndCreateDirectoryFiltering run %d, test %" PRIuS,
           loop_count, i);
       base::PlatformFileError expectation =
           kFilteringTestCases[i].visible ?
           base::PLATFORM_FILE_OK :
           base::PLATFORM_FILE_ERROR_SECURITY;
       if (kFilteringTestCases[i].is_directory) {
         operation->CreateDirectory(
             url, false, false,
-            base::Bind(&ExpectEqHelper, test_name, expectation));
+            base::Bind(&ExpectEqHelper, FROM_HERE, test_name, expectation));
       } else {
         operation->CreateFile(
-            url, false, base::Bind(&ExpectEqHelper, test_name, expectation));
+            url, false, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                   test_name, expectation));
       }
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, CopySourceFiltering) {
   FilePath dest_path = root_path().AppendASCII("dest");
   FileSystemURL dest_url(origin(), type(), dest_path);
 
@@ skipping 20 matching lines @@
           "CopySourceFiltering run %d test %" PRIuS, loop_count, i);
       base::PlatformFileError expectation = base::PLATFORM_FILE_OK;
       if (loop_count == 0 || !kFilteringTestCases[i].visible) {
         // If the source does not exist or is not visible.
         expectation = base::PLATFORM_FILE_ERROR_NOT_FOUND;
       } else if (!kFilteringTestCases[i].is_directory) {
         // Cannot copy a visible file to a directory.
         expectation = base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
       }
       operation->Copy(
-          url, dest_url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, dest_url, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                    test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, CopyDestFiltering) {
   // Run the loop twice. The first run has no destination files.
   // The second run does.
   for (int loop_count = 0; loop_count < 2; ++loop_count) {
     if (loop_count == 1) {
@@ skipping 41 matching lines @@
           expectation = base::PLATFORM_FILE_ERROR_SECURITY;
         } else if (kFilteringTestCases[i].is_directory) {
           // Cannot copy a file to a directory.
           expectation = base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
         } else {
           // Copying from a file to a visible file that exists is ok.
           expectation = base::PLATFORM_FILE_OK;
         }
       }
       operation->Copy(
-          src_url, url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          src_url, url, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                   test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, MoveSourceFiltering) {
   FilePath dest_path = root_path().AppendASCII("dest");
   FileSystemURL dest_url(origin(), type(), dest_path);
 
   // Run the loop twice. The first run has no source files. The second run does.
@@ skipping 19 matching lines @@
           "MoveSourceFiltering run %d test %" PRIuS, loop_count, i);
       base::PlatformFileError expectation = base::PLATFORM_FILE_OK;
       if (loop_count == 0 || !kFilteringTestCases[i].visible) {
         // If the source does not exist or is not visible.
         expectation = base::PLATFORM_FILE_ERROR_NOT_FOUND;
       } else if (!kFilteringTestCases[i].is_directory) {
         // Cannot move a visible file to a directory.
         expectation = base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
       }
       operation->Move(
-          url, dest_url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, dest_url, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                    test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, MoveDestFiltering) {
   // Run the loop twice. The first run has no destination files.
   // The second run does.
   for (int loop_count = 0; loop_count < 2; ++loop_count) {
     if (loop_count == 1) {
@@ skipping 42 matching lines @@
           expectation = base::PLATFORM_FILE_ERROR_SECURITY;
         } else if (kFilteringTestCases[i].is_directory) {
           // Cannot move a file to a directory.
           expectation = base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
         } else {
           // Moving from a file to a visible file that exists is ok.
           expectation = base::PLATFORM_FILE_OK;
         }
       }
       operation->Move(
-          src_url, url, base::Bind(&ExpectEqHelper, test_name, expectation));
+          src_url, url, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                   test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, GetMetadataFiltering) {
   // Run the loop twice. The first run has no files. The second run does.
   for (int loop_count = 0; loop_count < 2; ++loop_count) {
     if (loop_count == 1) {
       PopulateDirectoryWithTestCases(root_path(),
@@ skipping 40 matching lines @@
       FileSystemURL url(origin(), type(), path);
 
       std::string test_name = base::StringPrintf(
           "RemoveFiltering run %d test %" PRIuS, loop_count, i);
       base::PlatformFileError expectation = base::PLATFORM_FILE_OK;
       if (loop_count == 0 || !kFilteringTestCases[i].visible) {
         // Cannot remove files that do not exist or are not visible.
         expectation = base::PLATFORM_FILE_ERROR_NOT_FOUND;
       }
       operation->Remove(
-          url, false, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, false, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                 test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, TruncateFiltering) {
   // Run the loop twice. The first run has no files. The second run does.
   for (int loop_count = 0; loop_count < 2; ++loop_count) {
     if (loop_count == 1) {
       PopulateDirectoryWithTestCases(root_path(),
@@ skipping 11 matching lines @@
           "TruncateFiltering run %d test %" PRIuS, loop_count, i);
       base::PlatformFileError expectation = base::PLATFORM_FILE_OK;
       if (loop_count == 0 || !kFilteringTestCases[i].visible) {
         // Cannot truncate files that do not exist or are not visible.
         expectation = base::PLATFORM_FILE_ERROR_NOT_FOUND;
       } else if (kFilteringTestCases[i].is_directory) {
         // Cannot truncate directories.
         expectation = base::PLATFORM_FILE_ERROR_ACCESS_DENIED;
       }
       operation->Truncate(
-          url, 0, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, 0, base::Bind(&ExpectEqHelper, FROM_HERE,
+                             test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }
 
 TEST_F(NativeMediaFileUtilTest, TouchFileFiltering) {
   base::Time time = base::Time::Now();
 
   // Run the loop twice. The first run has no files. The second run does.
   for (int loop_count = 0; loop_count < 2; ++loop_count) {
@@ skipping 10 matching lines @@
       FileSystemURL url(origin(), type(), path);
 
       std::string test_name = base::StringPrintf(
           "TouchFileFiltering run %d test %" PRIuS, loop_count, i);
       base::PlatformFileError expectation = base::PLATFORM_FILE_OK;
       if (loop_count == 0 || !kFilteringTestCases[i].visible) {
         // Files do not exists. Touch fails.
         expectation = base::PLATFORM_FILE_ERROR_FAILED;
       }
       operation->TouchFile(
-          url, time, time, base::Bind(&ExpectEqHelper, test_name, expectation));
+          url, time, time, base::Bind(&ExpectEqHelper, FROM_HERE,
+                                      test_name, expectation));
       MessageLoop::current()->RunUntilIdle();
     }
   }
 }