| 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 MakeSingleFakeGallery(&pref_id); | 441 MakeSingleFakeGallery(&pref_id); |
| 442 | 442 |
| 443 base::ListValue custom_args; | 443 base::ListValue custom_args; |
| 444 custom_args.AppendInteger(base::checked_cast<int>(pref_id)); | 444 custom_args.AppendInteger(base::checked_cast<int>(pref_id)); |
| 445 custom_args.AppendString( | 445 custom_args.AppendString( |
| 446 browser()->profile()->GetPath().BaseName().MaybeAsASCII()); | 446 browser()->profile()->GetPath().BaseName().MaybeAsASCII()); |
| 447 | 447 |
| 448 ASSERT_TRUE(RunMediaGalleriesTestWithArg("tourl", custom_args)) << message_; | 448 ASSERT_TRUE(RunMediaGalleriesTestWithArg("tourl", custom_args)) << message_; |
| 449 } | 449 } |
| 450 | 450 |
| 451 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, GetMetadata) { | 451 // The test failed continuosly on linux_ChromeOS. Disable it until the root |
| 452 // cause if fixed. crbug.com/618121. |
| 453 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
| 454 DISABLED_GetMetadata) { |
| 452 RemoveAllGalleries(); | 455 RemoveAllGalleries(); |
| 453 MakeSingleFakeGallery(NULL); | 456 MakeSingleFakeGallery(NULL); |
| 454 | 457 |
| 455 AddFileToSingleFakeGallery(media::GetTestDataFilePath("90rotation.mp4")); | 458 AddFileToSingleFakeGallery(media::GetTestDataFilePath("90rotation.mp4")); |
| 456 AddFileToSingleFakeGallery(media::GetTestDataFilePath("id3_png_test.mp3")); | 459 AddFileToSingleFakeGallery(media::GetTestDataFilePath("id3_png_test.mp3")); |
| 457 | 460 |
| 458 base::ListValue custom_args; | 461 base::ListValue custom_args; |
| 459 #if defined(USE_PROPRIETARY_CODECS) | 462 #if defined(USE_PROPRIETARY_CODECS) |
| 460 custom_args.AppendBoolean(true); | 463 custom_args.AppendBoolean(true); |
| 461 #else | 464 #else |
| 462 custom_args.AppendBoolean(false); | 465 custom_args.AppendBoolean(false); |
| 463 #endif | 466 #endif |
| 464 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 467 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
| 465 << message_; | 468 << message_; |
| 466 } | 469 } |
| OLD | NEW |