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 <set> | 5 #include <set> |
6 #include <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 new TestPicasaFileUtil(media_path_filter_.get(), | 243 new TestPicasaFileUtil(media_path_filter_.get(), |
244 picasa_data_provider_.get()))); | 244 picasa_data_provider_.get()))); |
245 | 245 |
246 file_system_context_ = new fileapi::FileSystemContext( | 246 file_system_context_ = new fileapi::FileSystemContext( |
247 base::MessageLoopProxy::current().get(), | 247 base::MessageLoopProxy::current().get(), |
248 base::MessageLoopProxy::current().get(), | 248 base::MessageLoopProxy::current().get(), |
249 fileapi::ExternalMountPoints::CreateRefCounted().get(), | 249 fileapi::ExternalMountPoints::CreateRefCounted().get(), |
250 storage_policy.get(), | 250 storage_policy.get(), |
251 NULL, | 251 NULL, |
252 additional_providers.Pass(), | 252 additional_providers.Pass(), |
| 253 std::vector<fileapi::URLRequestAutoMountHandler>(), |
253 profile_dir_.path(), | 254 profile_dir_.path(), |
254 content::CreateAllowFileAccessOptions()); | 255 content::CreateAllowFileAccessOptions()); |
255 } | 256 } |
256 | 257 |
257 virtual void TearDown() OVERRIDE { | 258 virtual void TearDown() OVERRIDE { |
258 SynchronouslyRunOnMediaTaskRunner( | 259 SynchronouslyRunOnMediaTaskRunner( |
259 base::Bind(&PicasaFileUtilTest::TearDownOnMediaTaskRunner, | 260 base::Bind(&PicasaFileUtilTest::TearDownOnMediaTaskRunner, |
260 base::Unretained(this))); | 261 base::Unretained(this))); |
261 } | 262 } |
262 | 263 |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 operation_runner()->CreateSnapshotFile( | 588 operation_runner()->CreateSnapshotFile( |
588 CreateURL(std::string(kPicasaDirAlbums) + | 589 CreateURL(std::string(kPicasaDirAlbums) + |
589 "/albumname 2013-04-16/mapped_name.jpg"), | 590 "/albumname 2013-04-16/mapped_name.jpg"), |
590 snapshot_callback); | 591 snapshot_callback); |
591 loop.Run(); | 592 loop.Run(); |
592 EXPECT_EQ(base::File::FILE_OK, error); | 593 EXPECT_EQ(base::File::FILE_OK, error); |
593 EXPECT_EQ(image_path, platform_path_result); | 594 EXPECT_EQ(image_path, platform_path_result); |
594 } | 595 } |
595 | 596 |
596 } // namespace picasa | 597 } // namespace picasa |
OLD | NEW |