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

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

Issue 306393002: Pepper: Move "Core" test to content_browsertests. (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 | content/test/ppapi/ppapi_browsertest.cc » ('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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 } 180 }
181 181
182 TEST_PPAPI_NACL(Console) 182 TEST_PPAPI_NACL(Console)
183 183
184 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) 184 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
185 // TODO(erg): linux_aura bringup: http://crbug.com/318961 185 // TODO(erg): linux_aura bringup: http://crbug.com/318961
186 #define MAYBE_Core DISABLED_Core 186 #define MAYBE_Core DISABLED_Core
187 #else 187 #else
188 #define MAYBE_Core Core 188 #define MAYBE_Core Core
189 #endif 189 #endif
190 TEST_PPAPI_IN_PROCESS(MAYBE_Core)
191 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_Core)
192 TEST_PPAPI_NACL(MAYBE_Core) 190 TEST_PPAPI_NACL(MAYBE_Core)
193 191
194 // Non-NaCl TraceEvent tests are in content/test/ppapi/ppapi_browsertest.cc. 192 // Non-NaCl TraceEvent tests are in content/test/ppapi/ppapi_browsertest.cc.
195 TEST_PPAPI_NACL(TraceEvent) 193 TEST_PPAPI_NACL(TraceEvent)
196 194
197 TEST_PPAPI_NACL(InputEvent) 195 TEST_PPAPI_NACL(InputEvent)
198 196
199 // Flaky on Linux and Windows. http://crbug.com/135403 197 // Flaky on Linux and Windows. http://crbug.com/135403
200 #if defined(OS_LINUX) || defined(OS_WIN) 198 #if defined(OS_LINUX) || defined(OS_WIN)
201 #define MAYBE_ImeInputEvent DISABLED_ImeInputEvent 199 #define MAYBE_ImeInputEvent DISABLED_ImeInputEvent
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 LIST_TEST(FlashDRM_GetHmonitor) 1263 LIST_TEST(FlashDRM_GetHmonitor)
1266 LIST_TEST(FlashDRM_GetVoucherFile)); 1264 LIST_TEST(FlashDRM_GetVoucherFile));
1267 } 1265 }
1268 1266
1269 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1267 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1270 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1268 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1271 1269
1272 #if defined(OS_CHROMEOS) 1270 #if defined(OS_CHROMEOS)
1273 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1271 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1274 #endif 1272 #endif
OLDNEW
« no previous file with comments | « no previous file | content/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698