OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/bind.h" | 10 #include "base/bind.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 new TestIPhotoFileUtil(media_path_filter_.get(), | 207 new TestIPhotoFileUtil(media_path_filter_.get(), |
208 iphoto_data_provider_.get()))); | 208 iphoto_data_provider_.get()))); |
209 | 209 |
210 file_system_context_ = new fileapi::FileSystemContext( | 210 file_system_context_ = new fileapi::FileSystemContext( |
211 base::MessageLoopProxy::current().get(), | 211 base::MessageLoopProxy::current().get(), |
212 base::MessageLoopProxy::current().get(), | 212 base::MessageLoopProxy::current().get(), |
213 fileapi::ExternalMountPoints::CreateRefCounted().get(), | 213 fileapi::ExternalMountPoints::CreateRefCounted().get(), |
214 storage_policy.get(), | 214 storage_policy.get(), |
215 NULL, | 215 NULL, |
216 additional_providers.Pass(), | 216 additional_providers.Pass(), |
| 217 std::vector<fileapi::URLRequestAutoMountHandler>(), |
217 profile_dir_.path(), | 218 profile_dir_.path(), |
218 content::CreateAllowFileAccessOptions()); | 219 content::CreateAllowFileAccessOptions()); |
219 } | 220 } |
220 | 221 |
221 protected: | 222 protected: |
222 void TestNonexistentFolder(const std::string& path_append) { | 223 void TestNonexistentFolder(const std::string& path_append) { |
223 FileSystemOperation::FileEntryList contents; | 224 FileSystemOperation::FileEntryList contents; |
224 FileSystemURL url = CreateURL(path_append); | 225 FileSystemURL url = CreateURL(path_append); |
225 bool completed = false; | 226 bool completed = false; |
226 ReadDirectoryTestHelper(operation_runner(), url, &contents, &completed); | 227 ReadDirectoryTestHelper(operation_runner(), url, &contents, &completed); |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 completed = false; | 338 completed = false; |
338 ReadDirectoryTestHelper(operation_runner(), url, &contents, &completed); | 339 ReadDirectoryTestHelper(operation_runner(), url, &contents, &completed); |
339 ASSERT_TRUE(completed); | 340 ASSERT_TRUE(completed); |
340 ASSERT_EQ(1u, contents.size()); | 341 ASSERT_EQ(1u, contents.size()); |
341 | 342 |
342 EXPECT_FALSE(contents.front().is_directory); | 343 EXPECT_FALSE(contents.front().is_directory); |
343 EXPECT_EQ("a.jpg", contents.front().name); | 344 EXPECT_EQ("a.jpg", contents.front().name); |
344 } | 345 } |
345 | 346 |
346 } // namespace iphoto | 347 } // namespace iphoto |
OLD | NEW |