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" |
11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/apps/app_browsertest_util.h" | 14 #include "chrome/browser/apps/app_browsertest_util.h" |
15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/extensions/extension_system.h" | |
17 #include "chrome/browser/media_galleries/media_file_system_registry.h" | 16 #include "chrome/browser/media_galleries/media_file_system_registry.h" |
18 #include "chrome/browser/media_galleries/media_galleries_preferences.h" | 17 #include "chrome/browser/media_galleries/media_galleries_preferences.h" |
19 #include "chrome/browser/media_galleries/media_galleries_test_util.h" | 18 #include "chrome/browser/media_galleries/media_galleries_test_util.h" |
20 #include "chrome/browser/storage_monitor/storage_info.h" | 19 #include "chrome/browser/storage_monitor/storage_info.h" |
21 #include "chrome/browser/storage_monitor/storage_monitor.h" | 20 #include "chrome/browser/storage_monitor/storage_monitor.h" |
22 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
23 #include "content/public/test/test_utils.h" | 22 #include "content/public/test/test_utils.h" |
| 23 #include "extensions/browser/extension_system.h" |
24 | 24 |
25 #if defined(OS_WIN) || defined(OS_MACOSX) | 25 #if defined(OS_WIN) || defined(OS_MACOSX) |
26 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" | 26 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" |
27 #include "chrome/common/media_galleries/picasa_test_util.h" | 27 #include "chrome/common/media_galleries/picasa_test_util.h" |
28 #include "chrome/common/media_galleries/picasa_types.h" | 28 #include "chrome/common/media_galleries/picasa_types.h" |
29 #include "chrome/common/media_galleries/pmp_test_util.h" | 29 #include "chrome/common/media_galleries/pmp_test_util.h" |
30 #endif | 30 #endif |
31 | 31 |
32 #if defined(OS_MACOSX) | 32 #if defined(OS_MACOSX) |
33 #include "base/mac/foundation_util.h" | 33 #include "base/mac/foundation_util.h" |
(...skipping 405 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) |
OLD | NEW |