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

Side by Side Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 16296005: Split pnacl and nacl mime types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add JS test for mime type. Created 7 years, 6 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 | Annotate | Revision Log
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 "chrome/test/nacl/nacl_browsertest_util.h" 5 #include "chrome/test/nacl/nacl_browsertest_util.h"
6 6
7 namespace { 7 namespace {
8 8
9 // These tests fail on Linux ASAN bots: <http://crbug.com/161709>. 9 // These tests fail on Linux ASAN bots: <http://crbug.com/161709>.
10 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) 10 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 }) 51 })
52 52
53 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, { 53 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, {
54 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); 54 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html"));
55 }) 55 })
56 56
57 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, { 57 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, {
58 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); 58 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html"));
59 }) 59 })
60 60
61 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PNACL(PnaclMimeType), {
jvoung (off chromium) 2013/06/07 23:55:24 I think for the NACL_BROWSER_TEST_F it already doe
jvoung (off chromium) 2013/06/10 16:23:15 Oh the macro has to be defined between line 10 and
62 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
63 })
64
61 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginCORS) { 65 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginCORS) {
62 RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors.html")); 66 RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors.html"));
63 } 67 }
64 68
65 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginFail) { 69 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginFail) {
66 RunLoadTest(FILE_PATH_LITERAL("cross_origin/fail.html")); 70 RunLoadTest(FILE_PATH_LITERAL("cross_origin/fail.html"));
67 } 71 }
68 72
69 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_SameOriginCookie) { 73 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_SameOriginCookie) {
70 RunLoadTest(FILE_PATH_LITERAL("cross_origin/same_origin_cookie.html")); 74 RunLoadTest(FILE_PATH_LITERAL("cross_origin/same_origin_cookie.html"));
(...skipping 28 matching lines...) Expand all
99 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=time_passes")); 103 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=time_passes"));
100 } 104 }
101 105
102 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 106 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
103 MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) { 107 MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) {
104 RunNaClIntegrationTest(FILE_PATH_LITERAL( 108 RunNaClIntegrationTest(FILE_PATH_LITERAL(
105 "pnacl_dyncode_syscall_disabled.html")); 109 "pnacl_dyncode_syscall_disabled.html"));
106 } 110 }
107 111
108 } // namespace anonymous 112 } // namespace anonymous
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/progress_events/ppapi_progress_events.html ('k') | chrome/test/nacl/nacl_browsertest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698