Cleanup: Removing FileSystemPathManager

webkit/fileapi/obfuscated_file_util_unittest.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
+#include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/fileapi/obfuscated_file_util.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
 using namespace fileapi;
 
 namespace {
 
 FilePath UTF8ToFilePath(const std::string& str) {
@@ skipping 102 matching lines @@
         type_(kFileSystemTypeTemporary),
         weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         test_helper_(origin_, type_),
         quota_status_(quota::kQuotaStatusUnknown),
         usage_(-1) {
   }
 
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
 
+    scoped_refptr<quota::SpecialStoragePolicy> storage_policy =
+        new quota::MockSpecialStoragePolicy();
+
     quota_manager_ = new quota::QuotaManager(
         false /* is_incognito */,
         data_dir_.path(),
         base::MessageLoopProxy::current(),
         base::MessageLoopProxy::current(),
-        NULL /* special storage policy */);
+        storage_policy);
 
     // Every time we create a new helper, it creates another context, which
     // creates another path manager, another sandbox_mount_point_provider, and
     // another OFU.  We need to pass in the context to skip all that.
     file_system_context_ = new FileSystemContext(
         base::MessageLoopProxy::current(),
         base::MessageLoopProxy::current(),
-        new quota::MockSpecialStoragePolicy(),
+        storage_policy,
         quota_manager_->proxy(),
         data_dir_.path(),
-        false /* incognito */,
-        true /* allow_file_access_from_files */,
-        NULL /* path_manager */);
+        new MockFileSystemOptions());
 
     obfuscated_file_util_ = static_cast<ObfuscatedFileUtil*>(
-        file_system_context_->path_manager()->GetFileUtil(type_));
+        file_system_context_->GetFileUtil(type_));
 
     test_helper_.SetUp(file_system_context_.get(),
                        obfuscated_file_util_.get());
   }
 
+  void TearDown() {
+    quota_manager_ = NULL;
+    test_helper_.TearDown();
+  }
+
   FileSystemOperationContext* NewContext(FileSystemTestOriginHelper* helper) {
     FileSystemOperationContext* context;
     if (helper)
       context = helper->NewOperationContext();
     else
       context = test_helper_.NewOperationContext();
     context->set_allowed_bytes_growth(1024 * 1024); // Big enough for all tests.
     return context;
   }
 
@@ skipping 1514 matching lines @@
 TEST_F(ObfuscatedFileUtilTest, TestDirectoryTimestampForCopyAndMove) {
   TestDirectoryTimestampHelper(
       FilePath(FILE_PATH_LITERAL("copy overwrite")), true, true);
   TestDirectoryTimestampHelper(
       FilePath(FILE_PATH_LITERAL("copy non-overwrite")), true, false);
   TestDirectoryTimestampHelper(
       FilePath(FILE_PATH_LITERAL("move overwrite")), false, true);
   TestDirectoryTimestampHelper(
       FilePath(FILE_PATH_LITERAL("move non-overwrite")), false, false);
 }