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

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

Issue 304353018: Restore URLRequest_SetProperty NaCl testing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | 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 "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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ 534 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \
535 DISABLED_URLRequest_CreateAndIsURLRequestInfo 535 DISABLED_URLRequest_CreateAndIsURLRequestInfo
536 #else 536 #else
537 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ 537 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \
538 URLRequest_CreateAndIsURLRequestInfo 538 URLRequest_CreateAndIsURLRequestInfo
539 #endif 539 #endif
540 TEST_PPAPI_NACL(MAYBE_URLRequest_CreateAndIsURLRequestInfo) 540 TEST_PPAPI_NACL(MAYBE_URLRequest_CreateAndIsURLRequestInfo)
541 541
542 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_SetProperty) 542 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_SetProperty)
543 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_SetProperty) 543 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_SetProperty)
544 // http://crbug.com/167150 544 TEST_PPAPI_NACL(URLRequest_SetProperty)
545 TEST_PPAPI_NACL(DISABLED_URLRequest_SetProperty)
546 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody) 545 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody)
547 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody) 546 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody)
548 TEST_PPAPI_NACL(URLRequest_AppendDataToBody) 547 TEST_PPAPI_NACL(URLRequest_AppendDataToBody)
549 TEST_PPAPI_IN_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody) 548 TEST_PPAPI_IN_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody)
550 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody) 549 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody)
551 TEST_PPAPI_NACL(DISABLED_URLRequest_AppendFileToBody) 550 TEST_PPAPI_NACL(DISABLED_URLRequest_AppendFileToBody)
552 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_Stress) 551 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_Stress)
553 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_Stress) 552 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_Stress)
554 TEST_PPAPI_NACL(URLRequest_Stress) 553 TEST_PPAPI_NACL(URLRequest_Stress)
555 554
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 LIST_TEST(FlashDRM_GetHmonitor) 1262 LIST_TEST(FlashDRM_GetHmonitor)
1264 LIST_TEST(FlashDRM_GetVoucherFile)); 1263 LIST_TEST(FlashDRM_GetVoucherFile));
1265 } 1264 }
1266 1265
1267 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1266 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1268 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1267 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1269 1268
1270 #if defined(OS_CHROMEOS) 1269 #if defined(OS_CHROMEOS)
1271 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1270 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1272 #endif 1271 #endif
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