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

Side by Side Diff: trunk/src/content/test/ppapi/ppapi_browsertest.cc

Issue 327353002: Revert 275874 "out-of-process too" Base URL: svn://svn.chromium.org/chrome/
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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/test/ppapi/ppapi_test.h" 5 #include "content/test/ppapi/ppapi_test.h"
6 #include "ppapi/shared_impl/test_harness_utils.h" 6 #include "ppapi/shared_impl/test_harness_utils.h"
7 7
8 // This file lists tests for Pepper APIs (without NaCl) against content_shell. 8 // This file lists tests for Pepper APIs (without NaCl) against content_shell.
9 // TODO(teravest): Move more tests here. http://crbug.com/371873 9 // TODO(teravest): Move more tests here. http://crbug.com/371873
10 10
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 TEST_PPAPI_OUT_OF_PROCESS(NetworkProxy) 114 TEST_PPAPI_OUT_OF_PROCESS(NetworkProxy)
115 115
116 // TODO(danakj): http://crbug.com/115286 116 // TODO(danakj): http://crbug.com/115286
117 TEST_PPAPI_IN_PROCESS(DISABLED_Scrollbar) 117 TEST_PPAPI_IN_PROCESS(DISABLED_Scrollbar)
118 // http://crbug.com/89961 118 // http://crbug.com/89961
119 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Scrollbar) 119 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Scrollbar)
120 120
121 TEST_PPAPI_IN_PROCESS(TraceEvent) 121 TEST_PPAPI_IN_PROCESS(TraceEvent)
122 TEST_PPAPI_OUT_OF_PROCESS(TraceEvent) 122 TEST_PPAPI_OUT_OF_PROCESS(TraceEvent)
123 123
124 // TODO(scottmg): Disabled with DirectWrite investigating, probably sandbox-
125 // related. http://crbug.com/382729
126 #if !defined(OS_WIN)
127 TEST_PPAPI_OUT_OF_PROCESS(TrueTypeFont) 124 TEST_PPAPI_OUT_OF_PROCESS(TrueTypeFont)
128 #endif
129 125
130 TEST_PPAPI_IN_PROCESS(URLUtil) 126 TEST_PPAPI_IN_PROCESS(URLUtil)
131 TEST_PPAPI_OUT_OF_PROCESS(URLUtil) 127 TEST_PPAPI_OUT_OF_PROCESS(URLUtil)
132 128
133 TEST_PPAPI_IN_PROCESS(Var) 129 TEST_PPAPI_IN_PROCESS(Var)
134 TEST_PPAPI_OUT_OF_PROCESS(Var) 130 TEST_PPAPI_OUT_OF_PROCESS(Var)
135 131
136 // Flaky on mac, http://crbug.com/121107 132 // Flaky on mac, http://crbug.com/121107
137 #if defined(OS_MACOSX) 133 #if defined(OS_MACOSX)
138 #define MAYBE_VarDeprecated DISABLED_VarDeprecated 134 #define MAYBE_VarDeprecated DISABLED_VarDeprecated
139 #else 135 #else
140 #define MAYBE_VarDeprecated VarDeprecated 136 #define MAYBE_VarDeprecated VarDeprecated
141 #endif 137 #endif
142 TEST_PPAPI_IN_PROCESS(VarDeprecated) 138 TEST_PPAPI_IN_PROCESS(VarDeprecated)
143 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated) 139 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated)
144 140
145 TEST_PPAPI_IN_PROCESS(VarResource) 141 TEST_PPAPI_IN_PROCESS(VarResource)
146 TEST_PPAPI_OUT_OF_PROCESS(VarResource) 142 TEST_PPAPI_OUT_OF_PROCESS(VarResource)
147 143
148 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) 144 TEST_PPAPI_IN_PROCESS(VideoDecoderDev)
149 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) 145 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev)
150 146
151 } // namespace 147 } // namespace
152 } // namespace content 148 } // namespace content
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