Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Side by Side Diff: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

Issue 619683002: Reenable MediaGalleriesPlatformAppBrowserTest.MediaGalleriesRead test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 508
509 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) { 509 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) {
510 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries")) << message_; 510 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries")) << message_;
511 } 511 }
512 512
513 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, 513 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
514 NoGalleriesCopyTo) { 514 NoGalleriesCopyTo) {
515 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries_copy_to")) << message_; 515 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries_copy_to")) << message_;
516 } 516 }
517 517
518 // Test is flaky. crbug.com/416128
519 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, 518 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
520 DISABLED_MediaGalleriesRead) { 519 MediaGalleriesRead) {
521 RemoveAllGalleries(); 520 RemoveAllGalleries();
522 MakeSingleFakeGallery(NULL); 521 MakeSingleFakeGallery(NULL);
523 base::ListValue custom_args; 522 base::ListValue custom_args;
524 custom_args.AppendInteger(test_jpg_size()); 523 custom_args.AppendInteger(test_jpg_size());
525 524
526 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args)) 525 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args))
527 << message_; 526 << message_;
528 } 527 }
529 528
530 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux 529 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 669
671 base::ListValue custom_args; 670 base::ListValue custom_args;
672 #if defined(USE_PROPRIETARY_CODECS) 671 #if defined(USE_PROPRIETARY_CODECS)
673 custom_args.AppendBoolean(true); 672 custom_args.AppendBoolean(true);
674 #else 673 #else
675 custom_args.AppendBoolean(false); 674 custom_args.AppendBoolean(false);
676 #endif 675 #endif
677 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) 676 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
678 << message_; 677 << message_;
679 } 678 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698