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 | 7 |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "base/message_loop_proxy.h" |
12 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
13 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
14 #include "base/time.h" | 15 #include "base/time.h" |
15 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p
rovider.h" | 16 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p
rovider.h" |
16 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h" | 17 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h" |
17 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reade
r.h" | 18 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reade
r.h" |
18 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" | 19 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" |
19 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.h" | 20 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.h" |
20 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_constants.h" | 21 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_constants.h" |
21 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.h" | 22 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 | 142 |
142 scoped_ptr<PicasaDataProvider> data_provider_; | 143 scoped_ptr<PicasaDataProvider> data_provider_; |
143 }; | 144 }; |
144 | 145 |
145 class TestMediaFileSystemMountPointProvider | 146 class TestMediaFileSystemMountPointProvider |
146 : public chrome::MediaFileSystemMountPointProvider { | 147 : public chrome::MediaFileSystemMountPointProvider { |
147 public: | 148 public: |
148 TestMediaFileSystemMountPointProvider( | 149 TestMediaFileSystemMountPointProvider( |
149 const base::FilePath& profile_path, | 150 const base::FilePath& profile_path, |
150 PicasaFileUtil* picasa_file_util) | 151 PicasaFileUtil* picasa_file_util) |
151 : chrome::MediaFileSystemMountPointProvider(profile_path), | 152 : chrome::MediaFileSystemMountPointProvider( |
| 153 profile_path, base::MessageLoopProxy::current()), |
152 test_file_util_(picasa_file_util) { | 154 test_file_util_(picasa_file_util) { |
153 } | 155 } |
154 | 156 |
155 virtual fileapi::AsyncFileUtil* | 157 virtual fileapi::AsyncFileUtil* |
156 GetAsyncFileUtil(fileapi::FileSystemType type) OVERRIDE { | 158 GetAsyncFileUtil(fileapi::FileSystemType type) OVERRIDE { |
157 if (type != fileapi::kFileSystemTypePicasa) | 159 if (type != fileapi::kFileSystemTypePicasa) |
158 return NULL; | 160 return NULL; |
159 | 161 |
160 return test_file_util_.get(); | 162 return test_file_util_.get(); |
161 } | 163 } |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 new TestFolder(base::StringPrintf("folder-%05d", i), | 506 new TestFolder(base::StringPrintf("folder-%05d", i), |
505 date, | 507 date, |
506 base::StringPrintf("uid%05d", i), i % 5, i % 3)); | 508 base::StringPrintf("uid%05d", i), i % 5, i % 3)); |
507 } | 509 } |
508 | 510 |
509 SetupFolders(&test_folders); | 511 SetupFolders(&test_folders); |
510 VerifyFolderDirectoryList(test_folders); | 512 VerifyFolderDirectoryList(test_folders); |
511 } | 513 } |
512 | 514 |
513 } // namespace picasa | 515 } // namespace picasa |
OLD | NEW |