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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/files/file_enumerator.h" | 6 #include "base/files/file_enumerator.h" |
7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" | 12 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" |
13 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" | 13 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" |
14 #include "chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h" | 14 #include "chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h" |
15 #include "chrome/common/media_galleries/picasa_types.h" | 15 #include "chrome/common/media_galleries/picasa_types.h" |
16 #include "chrome/common/media_galleries/pmp_test_helper.h" | 16 #include "chrome/common/media_galleries/pmp_test_helper.h" |
17 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
18 #include "content/public/test/test_browser_thread.h" | 18 #include "content/public/test/test_browser_thread.h" |
19 | 19 |
20 using chrome::MediaFileSystemBackend; | |
21 | |
22 namespace picasa { | 20 namespace picasa { |
23 | 21 |
24 namespace { | 22 namespace { |
25 | 23 |
26 void WriteTestAlbumTable(const PmpTestHelper* test_helper, | 24 void WriteTestAlbumTable(const PmpTestHelper* test_helper, |
27 const base::FilePath& test_folder_1_path, | 25 const base::FilePath& test_folder_1_path, |
28 const base::FilePath& test_folder_2_path) { | 26 const base::FilePath& test_folder_2_path) { |
29 std::vector<uint32> category_vector; | 27 std::vector<uint32> category_vector; |
30 category_vector.push_back(kAlbumCategoryFolder); | 28 category_vector.push_back(kAlbumCategoryFolder); |
31 category_vector.push_back(kAlbumCategoryInvalid); | 29 category_vector.push_back(kAlbumCategoryInvalid); |
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 base::Unretained(this))); | 588 base::Unretained(this))); |
591 } | 589 } |
592 }; | 590 }; |
593 | 591 |
594 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, | 592 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, |
595 InvalidateInflightAlbumsIndexerTest) { | 593 InvalidateInflightAlbumsIndexerTest) { |
596 RunTest(); | 594 RunTest(); |
597 } | 595 } |
598 | 596 |
599 } // namespace picasa | 597 } // namespace picasa |
OLD | NEW |