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

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

Issue 303313002: Pepper: Move more stuff to content_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move some tests back 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 | « chrome/test/ppapi/ppapi_test.cc ('k') | content/test/ppapi/ppapi_test.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 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, 79 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest,
80 Instance_ExecuteScriptAtInstanceShutdown) { 80 Instance_ExecuteScriptAtInstanceShutdown) {
81 // (See the comment for the in-process version of this test above) 81 // (See the comment for the in-process version of this test above)
82 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); 82 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown");
83 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); 83 RunTest("Instance_ExecuteScriptAtInstanceShutdown");
84 } 84 }
85 85
86 TEST_PPAPI_IN_PROCESS(Instance_LeakedObjectDestructors) 86 TEST_PPAPI_IN_PROCESS(Instance_LeakedObjectDestructors)
87 TEST_PPAPI_OUT_OF_PROCESS(Instance_LeakedObjectDestructors) 87 TEST_PPAPI_OUT_OF_PROCESS(Instance_LeakedObjectDestructors)
88 88
89 // We run and reload the RecursiveObjects test to ensure that the
90 // InstanceObject (and others) are properly cleaned up after the first run.
91 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) {
92 RunTestAndReload("Instance_RecursiveObjects");
93 }
94 // TODO(dmichael): Make it work out-of-process (or at least see whether we
95 // care).
96 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest,
97 DISABLED_Instance_RecursiveObjects) {
98 RunTestAndReload("Instance_RecursiveObjects");
99 }
100
101 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamAudioTrack)
102
103 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamVideoTrack)
104
89 TEST_PPAPI_IN_PROCESS(Memory) 105 TEST_PPAPI_IN_PROCESS(Memory)
90 TEST_PPAPI_OUT_OF_PROCESS(Memory) 106 TEST_PPAPI_OUT_OF_PROCESS(Memory)
91 107
108 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Basics)
109 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
110
111 TEST_PPAPI_OUT_OF_PROCESS(NetworkProxy)
112
92 // TODO(danakj): http://crbug.com/115286 113 // TODO(danakj): http://crbug.com/115286
93 TEST_PPAPI_IN_PROCESS(DISABLED_Scrollbar) 114 TEST_PPAPI_IN_PROCESS(DISABLED_Scrollbar)
94 // http://crbug.com/89961 115 // http://crbug.com/89961
95 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Scrollbar) 116 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Scrollbar)
96 117
97 TEST_PPAPI_IN_PROCESS(TraceEvent) 118 TEST_PPAPI_IN_PROCESS(TraceEvent)
98 TEST_PPAPI_OUT_OF_PROCESS(TraceEvent) 119 TEST_PPAPI_OUT_OF_PROCESS(TraceEvent)
99 120
121 TEST_PPAPI_OUT_OF_PROCESS(TrueTypeFont)
122
100 TEST_PPAPI_IN_PROCESS(URLUtil) 123 TEST_PPAPI_IN_PROCESS(URLUtil)
101 TEST_PPAPI_OUT_OF_PROCESS(URLUtil) 124 TEST_PPAPI_OUT_OF_PROCESS(URLUtil)
102 125
103 TEST_PPAPI_IN_PROCESS(Var) 126 TEST_PPAPI_IN_PROCESS(Var)
104 TEST_PPAPI_OUT_OF_PROCESS(Var) 127 TEST_PPAPI_OUT_OF_PROCESS(Var)
105 128
106 // Flaky on mac, http://crbug.com/121107 129 // Flaky on mac, http://crbug.com/121107
107 #if defined(OS_MACOSX) 130 #if defined(OS_MACOSX)
108 #define MAYBE_VarDeprecated DISABLED_VarDeprecated 131 #define MAYBE_VarDeprecated DISABLED_VarDeprecated
109 #else 132 #else
110 #define MAYBE_VarDeprecated VarDeprecated 133 #define MAYBE_VarDeprecated VarDeprecated
111 #endif 134 #endif
112 TEST_PPAPI_IN_PROCESS(VarDeprecated) 135 TEST_PPAPI_IN_PROCESS(VarDeprecated)
113 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated) 136 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated)
114 137
115 TEST_PPAPI_IN_PROCESS(VarResource) 138 TEST_PPAPI_IN_PROCESS(VarResource)
116 TEST_PPAPI_OUT_OF_PROCESS(VarResource) 139 TEST_PPAPI_OUT_OF_PROCESS(VarResource)
117 140
118 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) 141 TEST_PPAPI_IN_PROCESS(VideoDecoderDev)
119 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) 142 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev)
120 143
121 } // namespace 144 } // namespace
122 } // namespace content 145 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | content/test/ppapi/ppapi_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698