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/callback.h" | 6 #include "base/callback.h" |
7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/numerics/safe_conversions.h" | 10 #include "base/numerics/safe_conversions.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/values.h" | 14 #include "base/values.h" |
15 #include "chrome/browser/apps/app_browsertest_util.h" | 15 #include "chrome/browser/apps/app_browsertest_util.h" |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h" | 17 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h" |
18 #include "chrome/browser/media_galleries/media_file_system_registry.h" | 18 #include "chrome/browser/media_galleries/media_file_system_registry.h" |
19 #include "chrome/browser/media_galleries/media_folder_finder.h" | 19 #include "chrome/browser/media_galleries/media_folder_finder.h" |
20 #include "chrome/browser/media_galleries/media_galleries_preferences.h" | 20 #include "chrome/browser/media_galleries/media_galleries_preferences.h" |
21 #include "chrome/browser/media_galleries/media_galleries_scan_result_controller.
h" | 21 #include "chrome/browser/media_galleries/media_galleries_scan_result_controller.
h" |
22 #include "chrome/browser/media_galleries/media_galleries_test_util.h" | 22 #include "chrome/browser/media_galleries/media_galleries_test_util.h" |
23 #include "chrome/browser/media_galleries/media_scan_manager.h" | 23 #include "chrome/browser/media_galleries/media_scan_manager.h" |
| 24 #include "chrome/browser/ui/extensions/app_launch_params.h" |
| 25 #include "chrome/browser/ui/extensions/application_launch.h" |
24 #include "chrome/common/chrome_paths.h" | 26 #include "chrome/common/chrome_paths.h" |
25 #include "components/storage_monitor/storage_info.h" | 27 #include "components/storage_monitor/storage_info.h" |
26 #include "components/storage_monitor/storage_monitor.h" | 28 #include "components/storage_monitor/storage_monitor.h" |
27 #include "content/public/browser/web_contents.h" | 29 #include "content/public/browser/web_contents.h" |
28 #include "content/public/test/test_utils.h" | 30 #include "content/public/test/test_utils.h" |
29 #include "extensions/browser/extension_system.h" | 31 #include "extensions/browser/extension_system.h" |
| 32 #include "extensions/common/constants.h" |
30 #include "extensions/common/extension.h" | 33 #include "extensions/common/extension.h" |
31 #include "extensions/test/result_catcher.h" | 34 #include "extensions/test/result_catcher.h" |
32 #include "media/base/test_data_util.h" | 35 #include "media/base/test_data_util.h" |
33 | 36 |
34 #if defined(OS_WIN) || defined(OS_MACOSX) | 37 #if defined(OS_WIN) || defined(OS_MACOSX) |
35 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" | 38 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" |
36 #include "chrome/common/media_galleries/picasa_test_util.h" | 39 #include "chrome/common/media_galleries/picasa_test_util.h" |
37 #include "chrome/common/media_galleries/picasa_types.h" | 40 #include "chrome/common/media_galleries/picasa_types.h" |
38 #include "chrome/common/media_galleries/pmp_test_util.h" | 41 #include "chrome/common/media_galleries/pmp_test_util.h" |
39 #endif | 42 #endif |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 }; | 466 }; |
464 | 467 |
465 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiTest, SendFilesystem) { | 468 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiTest, SendFilesystem) { |
466 RemoveAllGalleries(); | 469 RemoveAllGalleries(); |
467 MakeSingleFakeGallery(NULL); | 470 MakeSingleFakeGallery(NULL); |
468 | 471 |
469 const extensions::Extension* extension = LoadExtension(app_dir()); | 472 const extensions::Extension* extension = LoadExtension(app_dir()); |
470 ASSERT_TRUE(extension); | 473 ASSERT_TRUE(extension); |
471 | 474 |
472 extensions::ResultCatcher catcher; | 475 extensions::ResultCatcher catcher; |
473 AppLaunchParams params(browser()->profile(), | 476 AppLaunchParams params(browser()->profile(), extension, |
474 extension, | 477 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, |
475 extensions::LAUNCH_CONTAINER_NONE, | 478 extensions::SOURCE_UNTRACKED); |
476 NEW_WINDOW); | |
477 params.command_line = *CommandLine::ForCurrentProcess(); | 479 params.command_line = *CommandLine::ForCurrentProcess(); |
478 OpenApplication(params); | 480 OpenApplication(params); |
479 | 481 |
480 bool result = true; | 482 bool result = true; |
481 if (!catcher.GetNextResult()) { | 483 if (!catcher.GetNextResult()) { |
482 message_ = catcher.message(); | 484 message_ = catcher.message(); |
483 result = false; | 485 result = false; |
484 } | 486 } |
485 content::RunAllPendingInMessageLoop(); // avoid race on exit in registry. | 487 content::RunAllPendingInMessageLoop(); // avoid race on exit in registry. |
486 ASSERT_TRUE(result) << message_; | 488 ASSERT_TRUE(result) << message_; |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 | 671 |
670 base::ListValue custom_args; | 672 base::ListValue custom_args; |
671 #if defined(USE_PROPRIETARY_CODECS) | 673 #if defined(USE_PROPRIETARY_CODECS) |
672 custom_args.AppendBoolean(true); | 674 custom_args.AppendBoolean(true); |
673 #else | 675 #else |
674 custom_args.AppendBoolean(false); | 676 custom_args.AppendBoolean(false); |
675 #endif | 677 #endif |
676 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 678 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
677 << message_; | 679 << message_; |
678 } | 680 } |
OLD | NEW |