| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <map> | 5 #include <map> |
| 6 #include <set> | 6 #include <set> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 NULL /* quota_manager */, | 68 NULL /* quota_manager */, |
| 69 data_dir_.path(), | 69 data_dir_.path(), |
| 70 CreateAllowFileAccessOptions()); | 70 CreateAllowFileAccessOptions()); |
| 71 | 71 |
| 72 // For cross-FileUtil copy/move tests. | 72 // For cross-FileUtil copy/move tests. |
| 73 other_file_util_.reset(new LocalFileUtil()); | 73 other_file_util_.reset(new LocalFileUtil()); |
| 74 other_file_util_helper_.SetUp(file_system_context_, other_file_util_.get()); | 74 other_file_util_helper_.SetUp(file_system_context_, other_file_util_.get()); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void TearDown() { | 77 void TearDown() { |
| 78 isolated_context()->RevokeIsolatedFileSystem(filesystem_id_); | 78 isolated_context()->RemoveReference(filesystem_id_); |
| 79 other_file_util_helper_.TearDown(); | 79 other_file_util_helper_.TearDown(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 protected: | 82 protected: |
| 83 IsolatedContext* isolated_context() const { | 83 IsolatedContext* isolated_context() const { |
| 84 return IsolatedContext::GetInstance(); | 84 return IsolatedContext::GetInstance(); |
| 85 } | 85 } |
| 86 const FilePath& root_path() const { | 86 const FilePath& root_path() const { |
| 87 return data_dir_.path(); | 87 return data_dir_.path(); |
| 88 } | 88 } |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 context.get(), other_file_util(), file_util(), dest_path, src_path); | 442 context.get(), other_file_util(), file_util(), dest_path, src_path); |
| 443 ASSERT_TRUE(result == base::PLATFORM_FILE_ERROR_FAILED || | 443 ASSERT_TRUE(result == base::PLATFORM_FILE_ERROR_FAILED || |
| 444 result == base::PLATFORM_FILE_ERROR_NOT_EMPTY); | 444 result == base::PLATFORM_FILE_ERROR_NOT_EMPTY); |
| 445 | 445 |
| 446 VerifyDirectoriesHaveSameContent(file_util(), other_file_util(), | 446 VerifyDirectoriesHaveSameContent(file_util(), other_file_util(), |
| 447 src_path, dest_path); | 447 src_path, dest_path); |
| 448 } | 448 } |
| 449 } | 449 } |
| 450 | 450 |
| 451 } // namespace fileapi | 451 } // namespace fileapi |
| OLD | NEW |