| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 | 354 |
| 355 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) { | 355 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) { |
| 356 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries")) << message_; | 356 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries")) << message_; |
| 357 } | 357 } |
| 358 | 358 |
| 359 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 359 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
| 360 NoGalleriesCopyTo) { | 360 NoGalleriesCopyTo) { |
| 361 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries_copy_to")) << message_; | 361 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries_copy_to")) << message_; |
| 362 } | 362 } |
| 363 | 363 |
| 364 // Test is flaky on windows. See crbug.com/725354 |
| 365 #if defined(OS_WIN) |
| 366 #define MAYBE_MediaGalleriesRead DISABLED_MediaGalleriesRead |
| 367 #else |
| 368 #define MAYBE_MediaGalleriesRead MediaGalleriesRead |
| 369 #endif |
| 364 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 370 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
| 365 MediaGalleriesRead) { | 371 MAYBE_MediaGalleriesRead) { |
| 366 RemoveAllGalleries(); | 372 RemoveAllGalleries(); |
| 367 MakeSingleFakeGallery(NULL); | 373 MakeSingleFakeGallery(NULL); |
| 368 base::ListValue custom_args; | 374 base::ListValue custom_args; |
| 369 custom_args.AppendInteger(test_jpg_size()); | 375 custom_args.AppendInteger(test_jpg_size()); |
| 370 | 376 |
| 371 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args)) | 377 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args)) |
| 372 << message_; | 378 << message_; |
| 373 } | 379 } |
| 374 | 380 |
| 375 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux | 381 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 | 477 |
| 472 base::ListValue custom_args; | 478 base::ListValue custom_args; |
| 473 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 479 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
| 474 custom_args.AppendBoolean(true); | 480 custom_args.AppendBoolean(true); |
| 475 #else | 481 #else |
| 476 custom_args.AppendBoolean(false); | 482 custom_args.AppendBoolean(false); |
| 477 #endif | 483 #endif |
| 478 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 484 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
| 479 << message_; | 485 << message_; |
| 480 } | 486 } |
| OLD | NEW |