| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file_enumerator.h" | 8 #include "base/files/file_enumerator.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 virtual base::FilePath GetColumnFileDestination() const { | 234 virtual base::FilePath GetColumnFileDestination() const { |
| 235 return picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName); | 235 return picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName); |
| 236 } | 236 } |
| 237 | 237 |
| 238 private: | 238 private: |
| 239 void SetupFoldersAndDataProvider() { | 239 void SetupFoldersAndDataProvider() { |
| 240 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); | 240 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
| 241 ASSERT_TRUE(test_folder_1_.CreateUniqueTempDir()); | 241 ASSERT_TRUE(test_folder_1_.CreateUniqueTempDir()); |
| 242 ASSERT_TRUE(test_folder_2_.CreateUniqueTempDir()); | 242 ASSERT_TRUE(test_folder_2_.CreateUniqueTempDir()); |
| 243 ASSERT_TRUE(picasa_root_dir_.CreateUniqueTempDir()); | 243 ASSERT_TRUE(picasa_root_dir_.CreateUniqueTempDir()); |
| 244 ASSERT_TRUE(file_util::CreateDirectory( | 244 ASSERT_TRUE(base::CreateDirectory( |
| 245 picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName))); | 245 picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName))); |
| 246 ASSERT_TRUE(file_util::CreateDirectory( | 246 ASSERT_TRUE(base::CreateDirectory( |
| 247 picasa_root_dir_.path().AppendASCII(kPicasaTempDirName))); | 247 picasa_root_dir_.path().AppendASCII(kPicasaTempDirName))); |
| 248 | 248 |
| 249 picasa_data_provider_.reset(new TestPicasaDataProvider( | 249 picasa_data_provider_.reset(new TestPicasaDataProvider( |
| 250 picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName))); | 250 picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName))); |
| 251 } | 251 } |
| 252 | 252 |
| 253 virtual void StartTestOnMediaTaskRunner() { | 253 virtual void StartTestOnMediaTaskRunner() { |
| 254 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); | 254 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
| 255 | 255 |
| 256 data_provider()->RefreshData( | 256 data_provider()->RefreshData( |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 base::Unretained(this))); | 551 base::Unretained(this))); |
| 552 } | 552 } |
| 553 }; | 553 }; |
| 554 | 554 |
| 555 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, | 555 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, |
| 556 InvalidateInflightAlbumsIndexerTest) { | 556 InvalidateInflightAlbumsIndexerTest) { |
| 557 RunTest(); | 557 RunTest(); |
| 558 } | 558 } |
| 559 | 559 |
| 560 } // namespace picasa | 560 } // namespace picasa |
| OLD | NEW |