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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "components/storage_monitor/storage_info.h" | 28 #include "components/storage_monitor/storage_info.h" |
29 #include "components/storage_monitor/storage_monitor.h" | 29 #include "components/storage_monitor/storage_monitor.h" |
30 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
31 #include "content/public/test/test_utils.h" | 31 #include "content/public/test/test_utils.h" |
32 #include "extensions/browser/extension_system.h" | 32 #include "extensions/browser/extension_system.h" |
33 #include "extensions/browser/process_manager.h" | 33 #include "extensions/browser/process_manager.h" |
34 #include "extensions/common/constants.h" | 34 #include "extensions/common/constants.h" |
35 #include "extensions/common/extension.h" | 35 #include "extensions/common/extension.h" |
36 #include "extensions/test/result_catcher.h" | 36 #include "extensions/test/result_catcher.h" |
37 #include "media/base/test_data_util.h" | 37 #include "media/base/test_data_util.h" |
| 38 #include "media/media_features.h" |
38 | 39 |
39 #if defined(OS_WIN) || defined(OS_MACOSX) | 40 #if defined(OS_WIN) || defined(OS_MACOSX) |
40 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" | 41 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" |
41 #include "chrome/common/media_galleries/picasa_test_util.h" | 42 #include "chrome/common/media_galleries/picasa_test_util.h" |
42 #include "chrome/common/media_galleries/picasa_types.h" | 43 #include "chrome/common/media_galleries/picasa_types.h" |
43 #include "chrome/common/media_galleries/pmp_test_util.h" | 44 #include "chrome/common/media_galleries/pmp_test_util.h" |
44 #endif | 45 #endif |
45 | 46 |
46 #if defined(OS_MACOSX) | 47 #if defined(OS_MACOSX) |
47 #include "base/mac/foundation_util.h" | 48 #include "base/mac/foundation_util.h" |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
456 } | 457 } |
457 | 458 |
458 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, GetMetadata) { | 459 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, GetMetadata) { |
459 RemoveAllGalleries(); | 460 RemoveAllGalleries(); |
460 MakeSingleFakeGallery(NULL); | 461 MakeSingleFakeGallery(NULL); |
461 | 462 |
462 AddFileToSingleFakeGallery(media::GetTestDataFilePath("90rotation.mp4")); | 463 AddFileToSingleFakeGallery(media::GetTestDataFilePath("90rotation.mp4")); |
463 AddFileToSingleFakeGallery(media::GetTestDataFilePath("id3_png_test.mp3")); | 464 AddFileToSingleFakeGallery(media::GetTestDataFilePath("id3_png_test.mp3")); |
464 | 465 |
465 base::ListValue custom_args; | 466 base::ListValue custom_args; |
466 #if defined(USE_PROPRIETARY_CODECS) | 467 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
467 custom_args.AppendBoolean(true); | 468 custom_args.AppendBoolean(true); |
468 #else | 469 #else |
469 custom_args.AppendBoolean(false); | 470 custom_args.AppendBoolean(false); |
470 #endif | 471 #endif |
471 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 472 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
472 << message_; | 473 << message_; |
473 } | 474 } |
OLD | NEW |