| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/numerics/safe_conversions.h" | 9 #include "base/numerics/safe_conversions.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 PopulateIPhotoTestData( | 439 PopulateIPhotoTestData( |
| 440 ensure_media_directories_exists()->GetFakeIPhotoRootPath()); | 440 ensure_media_directories_exists()->GetFakeIPhotoRootPath()); |
| 441 | 441 |
| 442 base::ListValue custom_args; | 442 base::ListValue custom_args; |
| 443 custom_args.AppendInteger(test_jpg_size()); | 443 custom_args.AppendInteger(test_jpg_size()); |
| 444 ASSERT_TRUE(RunMediaGalleriesTestWithArg("iphoto", custom_args)) << message_; | 444 ASSERT_TRUE(RunMediaGalleriesTestWithArg("iphoto", custom_args)) << message_; |
| 445 | 445 |
| 446 iapps::SetMacPreferencesForTesting(NULL); | 446 iapps::SetMacPreferencesForTesting(NULL); |
| 447 } | 447 } |
| 448 #endif // defined(OS_MACOSX) | 448 #endif // defined(OS_MACOSX) |
| 449 |
| 450 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, Scan) { |
| 451 RemoveAllGalleries(); |
| 452 ASSERT_TRUE(RunMediaGalleriesTest("scan")) << message_; |
| 453 } |
| OLD | NEW |