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

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

Issue 2900213002: Revert of Disable MediaGalleriesRead on windows. (Closed)
Patch Set: Created 3 years, 7 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 <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
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
370 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, 364 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
371 MAYBE_MediaGalleriesRead) { 365 MediaGalleriesRead) {
372 RemoveAllGalleries(); 366 RemoveAllGalleries();
373 MakeSingleFakeGallery(NULL); 367 MakeSingleFakeGallery(NULL);
374 base::ListValue custom_args; 368 base::ListValue custom_args;
375 custom_args.AppendInteger(test_jpg_size()); 369 custom_args.AppendInteger(test_jpg_size());
376 370
377 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args)) 371 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args))
378 << message_; 372 << message_;
379 } 373 }
380 374
381 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux 375 // 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
477 471
478 base::ListValue custom_args; 472 base::ListValue custom_args;
479 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 473 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
480 custom_args.AppendBoolean(true); 474 custom_args.AppendBoolean(true);
481 #else 475 #else
482 custom_args.AppendBoolean(false); 476 custom_args.AppendBoolean(false);
483 #endif 477 #endif
484 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) 478 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
485 << message_; 479 << message_;
486 } 480 }
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