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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8758027: aura: Reenable PPAPITest.FLAKY_FlashFullscreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | Annotate | Revision Log
« 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/plugin_service.h" 9 #include "content/browser/plugin_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) 381 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
382 // Disabled because it times out: http://crbug.com/89961 382 // Disabled because it times out: http://crbug.com/89961
383 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) 383 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
384 TEST_PPAPI_NACL_VIA_HTTP(FileRef) 384 TEST_PPAPI_NACL_VIA_HTTP(FileRef)
385 385
386 386
387 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) 387 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
388 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) 388 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
389 TEST_PPAPI_NACL_VIA_HTTP(FileSystem) 389 TEST_PPAPI_NACL_VIA_HTTP(FileSystem)
390 390
391 // http://crbug.com/96767 and 104384 for aura. 391 // http://crbug.com/96767
392 #if !defined(OS_MACOSX) && !defined(USE_AURA) 392 #if !defined(OS_MACOSX)
393 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
394 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen 393 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
395 #else 394 #else
396 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen 395 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
397 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
398 #endif 396 #endif
399 397
400 TEST_F(PPAPITest, MAYBE_FlashFullscreen) { 398 TEST_F(PPAPITest, MAYBE_FlashFullscreen) {
401 RunTestViaHTTP("FlashFullscreen"); 399 RunTestViaHTTP("FlashFullscreen");
402 } 400 }
403 TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) { 401 TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) {
404 RunTestViaHTTP("FlashFullscreen"); 402 RunTestViaHTTP("FlashFullscreen");
405 } 403 }
406 // New implementation only honors fullscreen requests within a context of 404 // New implementation only honors fullscreen requests within a context of
407 // a user gesture. Since we do not yet have an infrastructure for testing 405 // a user gesture. Since we do not yet have an infrastructure for testing
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs) 487 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs)
490 488
491 TEST_PPAPI_IN_PROCESS(Audio_Creation) 489 TEST_PPAPI_IN_PROCESS(Audio_Creation)
492 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop) 490 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop)
493 TEST_PPAPI_IN_PROCESS(Audio_Failures) 491 TEST_PPAPI_IN_PROCESS(Audio_Failures)
494 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation) 492 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation)
495 TEST_PPAPI_OUT_OF_PROCESS(Audio_DestroyNoStop) 493 TEST_PPAPI_OUT_OF_PROCESS(Audio_DestroyNoStop)
496 TEST_PPAPI_OUT_OF_PROCESS(Audio_Failures) 494 TEST_PPAPI_OUT_OF_PROCESS(Audio_Failures)
497 495
498 #endif // ADDRESS_SANITIZER 496 #endif // ADDRESS_SANITIZER
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