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 "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" | 5 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 | 216 |
217 // The data provider must be destructed on the MediaTaskRunner. This is done | 217 // The data provider must be destructed on the MediaTaskRunner. This is done |
218 // in a posted task rather than directly because TestDone is called by | 218 // in a posted task rather than directly because TestDone is called by |
219 // PicasaDataProvider. The callee should not destroy the caller. | 219 // PicasaDataProvider. The callee should not destroy the caller. |
220 MediaFileSystemBackend::MediaTaskRunner()->PostTask( | 220 MediaFileSystemBackend::MediaTaskRunner()->PostTask( |
221 FROM_HERE, | 221 FROM_HERE, |
222 base::Bind(&PicasaDataProviderTest::DestructDataProviderThenQuit, | 222 base::Bind(&PicasaDataProviderTest::DestructDataProviderThenQuit, |
223 base::Unretained(this))); | 223 base::Unretained(this))); |
224 } | 224 } |
225 | 225 |
226 const base::FilePath& test_folder_1_path() { return test_folder_1_.path(); } | 226 const base::FilePath& test_folder_1_path() { |
227 const base::FilePath& test_folder_2_path() { return test_folder_2_.path(); } | 227 return test_folder_1_.GetPath(); |
| 228 } |
| 229 const base::FilePath& test_folder_2_path() { |
| 230 return test_folder_2_.GetPath(); |
| 231 } |
228 | 232 |
229 TestPicasaDataProvider* data_provider() const { | 233 TestPicasaDataProvider* data_provider() const { |
230 return picasa_data_provider_.get(); | 234 return picasa_data_provider_.get(); |
231 } | 235 } |
232 | 236 |
233 const base::FilePath GetTempDirPath() const { | 237 const base::FilePath GetTempDirPath() const { |
234 return picasa_root_dir_.GetPath().AppendASCII(kPicasaTempDirName); | 238 return picasa_root_dir_.GetPath().AppendASCII(kPicasaTempDirName); |
235 } | 239 } |
236 | 240 |
237 virtual base::FilePath GetColumnFileDestination() const { | 241 virtual base::FilePath GetColumnFileDestination() const { |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 base::Unretained(this))); | 558 base::Unretained(this))); |
555 } | 559 } |
556 }; | 560 }; |
557 | 561 |
558 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, | 562 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, |
559 InvalidateInflightAlbumsIndexerTest) { | 563 InvalidateInflightAlbumsIndexerTest) { |
560 RunTest(); | 564 RunTest(); |
561 } | 565 } |
562 | 566 |
563 } // namespace picasa | 567 } // namespace picasa |
OLD | NEW |