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

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 264303002: PPAPI: Implement synchronous postMessage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 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
« no previous file with comments | « no previous file | content/renderer/pepper/message_channel.h » ('j') | 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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
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 "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 55 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
56 } 56 }
57 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \ 57 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \
58 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ 58 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \
59 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 59 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
60 } 60 }
61 61
62 #if defined(DISABLE_NACL) 62 #if defined(DISABLE_NACL)
63 63
64 #define TEST_PPAPI_NACL(test_name) 64 #define TEST_PPAPI_NACL(test_name)
65 #define TEST_PPAPI_NACL_NO_PNACL(test_name)
65 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) 66 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
66 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) 67 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
67 68
68 #else 69 #else
69 70
71 // TODO(dmichael): Remove this macro, crbug.com/384539
72 #define TEST_PPAPI_NACL_NO_PNACL(test_name) \
73 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
74 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
75 } \
76 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
77 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
78 } \
79 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \
80 MAYBE_PNACL_NONSFI(test_name)) { \
81 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
82 }
83
70 // NaCl based PPAPI tests 84 // NaCl based PPAPI tests
71 #define TEST_PPAPI_NACL(test_name) \ 85 #define TEST_PPAPI_NACL(test_name) \
72 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 86 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
73 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 87 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
74 } \ 88 } \
75 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ 89 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
76 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 90 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
77 } \ 91 } \
78 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ 92 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
79 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 93 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1212 TEST_PPAPI_OUT_OF_PROCESS(VideoDestination) 1226 TEST_PPAPI_OUT_OF_PROCESS(VideoDestination)
1213 TEST_PPAPI_NACL(VideoDestination) 1227 TEST_PPAPI_NACL(VideoDestination)
1214 1228
1215 // VideoSource doesn't work in content_browsertests. 1229 // VideoSource doesn't work in content_browsertests.
1216 TEST_PPAPI_OUT_OF_PROCESS(VideoSource) 1230 TEST_PPAPI_OUT_OF_PROCESS(VideoSource)
1217 TEST_PPAPI_NACL(VideoSource) 1231 TEST_PPAPI_NACL(VideoSource)
1218 1232
1219 // Printing doesn't work in content_browsertests. 1233 // Printing doesn't work in content_browsertests.
1220 TEST_PPAPI_OUT_OF_PROCESS(Printing) 1234 TEST_PPAPI_OUT_OF_PROCESS(Printing)
1221 1235
1236 // TODO(dmichael): Make this work on PNaCl and remove the macro.
1237 // crbug.com/384539
1238 TEST_PPAPI_NACL_NO_PNACL(MessageHandler)
1239
1222 TEST_PPAPI_NACL(MessageLoop_Basics) 1240 TEST_PPAPI_NACL(MessageLoop_Basics)
1223 TEST_PPAPI_NACL(MessageLoop_Post) 1241 TEST_PPAPI_NACL(MessageLoop_Post)
1224 1242
1225 // Going forward, Flash APIs will only work out-of-process. 1243 // Going forward, Flash APIs will only work out-of-process.
1226 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) 1244 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
1227 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) 1245 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
1228 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) 1246 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
1229 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) 1247 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
1230 // http://crbug.com/176822 1248 // http://crbug.com/176822
1231 #if !defined(OS_WIN) 1249 #if !defined(OS_WIN)
(...skipping 27 matching lines...) Expand all
1259 LIST_TEST(FlashDRM_GetHmonitor) 1277 LIST_TEST(FlashDRM_GetHmonitor)
1260 LIST_TEST(FlashDRM_GetVoucherFile)); 1278 LIST_TEST(FlashDRM_GetVoucherFile));
1261 } 1279 }
1262 1280
1263 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1281 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1264 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1282 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1265 1283
1266 #if defined(OS_CHROMEOS) 1284 #if defined(OS_CHROMEOS)
1267 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1285 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1268 #endif 1286 #endif
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/message_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698