OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
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 "content/browser/plugin_service.h" |
9 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| 11 #include "content/common/pepper_plugin_registry.h" |
| 12 #include "chrome/common/chrome_paths.h" |
10 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
11 #include "chrome/test/automation/tab_proxy.h" | 14 #include "chrome/test/automation/tab_proxy.h" |
12 #include "chrome/test/ui/ui_test.h" | 15 #include "chrome/test/ui/ui_test.h" |
13 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
14 #include "net/test/test_server.h" | 17 #include "net/test/test_server.h" |
15 #include "webkit/plugins/plugin_switches.h" | 18 #include "webkit/plugins/plugin_switches.h" |
16 | 19 |
17 namespace { | 20 namespace { |
18 | 21 |
19 // Platform-specific filename relative to the chrome executable. | 22 // Platform-specific filename relative to the chrome executable. |
20 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
21 const wchar_t library_name[] = L"ppapi_tests.dll"; | 24 const wchar_t library_name[] = L"ppapi_tests.dll"; |
22 #elif defined(OS_MACOSX) | 25 #elif defined(OS_MACOSX) |
23 const char library_name[] = "ppapi_tests.plugin"; | 26 const char library_name[] = "ppapi_tests.plugin"; |
24 #elif defined(OS_POSIX) | 27 #elif defined(OS_POSIX) |
25 const char library_name[] = "libppapi_tests.so"; | 28 const char library_name[] = "libppapi_tests.so"; |
26 #endif | 29 #endif |
27 | 30 |
28 } // namespace | 31 } // namespace |
29 | 32 |
30 // In-process plugin test runner. See OutOfProcessPPAPITest below for the | 33 class PPAPITestBase : public UITest { |
31 // out-of-process version. | |
32 class PPAPITest : public UITest { | |
33 public: | 34 public: |
34 PPAPITest() { | 35 PPAPITestBase() { |
35 // Append the switch to register the pepper plugin. | |
36 // library name = <out dir>/<test_name>.<library_extension> | |
37 // MIME type = application/x-ppapi-<test_name> | |
38 FilePath plugin_dir; | |
39 PathService::Get(base::DIR_EXE, &plugin_dir); | |
40 | |
41 FilePath plugin_lib = plugin_dir.Append(library_name); | |
42 EXPECT_TRUE(file_util::PathExists(plugin_lib)); | |
43 FilePath::StringType pepper_plugin = plugin_lib.value(); | |
44 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); | |
45 launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins, | |
46 pepper_plugin); | |
47 | |
48 // The test sends us the result via a cookie. | 36 // The test sends us the result via a cookie. |
49 launch_arguments_.AppendSwitch(switches::kEnableFileCookies); | 37 launch_arguments_.AppendSwitch(switches::kEnableFileCookies); |
50 | 38 |
51 // Some stuff is hung off of the testing interface which is not enabled | 39 // Some stuff is hung off of the testing interface which is not enabled |
52 // by default. | 40 // by default. |
53 launch_arguments_.AppendSwitch(switches::kEnablePepperTesting); | 41 launch_arguments_.AppendSwitch(switches::kEnablePepperTesting); |
54 | 42 |
55 // Smooth scrolling confuses the scrollbar test. | 43 // Smooth scrolling confuses the scrollbar test. |
56 launch_arguments_.AppendSwitch(switches::kDisableSmoothScrolling); | 44 launch_arguments_.AppendSwitch(switches::kDisableSmoothScrolling); |
57 } | 45 } |
58 | 46 |
| 47 virtual std::string BuildQuery(const std::string& base, |
| 48 const std::string& test_case)=0; |
| 49 |
59 void RunTest(const std::string& test_case) { | 50 void RunTest(const std::string& test_case) { |
60 FilePath test_path; | 51 FilePath test_path; |
61 PathService::Get(base::DIR_SOURCE_ROOT, &test_path); | 52 EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_path)); |
62 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi")); | 53 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi")); |
63 test_path = test_path.Append(FILE_PATH_LITERAL("tests")); | 54 test_path = test_path.Append(FILE_PATH_LITERAL("tests")); |
64 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html")); | 55 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html")); |
65 | 56 |
66 // Sanity check the file name. | 57 // Sanity check the file name. |
67 EXPECT_TRUE(file_util::PathExists(test_path)); | 58 EXPECT_TRUE(file_util::PathExists(test_path)); |
68 | 59 |
69 GURL::Replacements replacements; | 60 GURL::Replacements replacements; |
70 std::string query("testcase="); | 61 std::string query = BuildQuery("", test_case); |
71 query += test_case; | |
72 replacements.SetQuery(query.c_str(), url_parse::Component(0, query.size())); | 62 replacements.SetQuery(query.c_str(), url_parse::Component(0, query.size())); |
73 GURL test_url = net::FilePathToFileURL(test_path); | 63 GURL test_url = net::FilePathToFileURL(test_path); |
74 RunTestURL(test_url.ReplaceComponents(replacements)); | 64 RunTestURL(test_url.ReplaceComponents(replacements)); |
75 } | 65 } |
76 | 66 |
77 void RunTestViaHTTP(const std::string& test_case) { | 67 void RunTestViaHTTP(const std::string& test_case) { |
| 68 FilePath fp = CommandLine::ForCurrentProcess()->GetProgram(); |
78 net::TestServer test_server( | 69 net::TestServer test_server( |
79 net::TestServer::TYPE_HTTP, | 70 net::TestServer::TYPE_HTTP, fp.DirName()); |
80 FilePath(FILE_PATH_LITERAL("ppapi/tests"))); | |
81 ASSERT_TRUE(test_server.Start()); | 71 ASSERT_TRUE(test_server.Start()); |
82 RunTestURL( | 72 std::string query = BuildQuery("files/test_case.html?", test_case); |
83 test_server.GetURL("files/test_case.html?testcase=" + test_case)); | 73 RunTestURL(test_server.GetURL(query)); |
84 } | 74 } |
85 | 75 |
86 private: | 76 private: |
87 void RunTestURL(const GURL& test_url) { | 77 void RunTestURL(const GURL& test_url) { |
88 scoped_refptr<TabProxy> tab(GetActiveTab()); | 78 scoped_refptr<TabProxy> tab(GetActiveTab()); |
89 ASSERT_TRUE(tab.get()); | 79 ASSERT_TRUE(tab.get()); |
90 ASSERT_TRUE(tab->NavigateToURL(test_url)); | 80 ASSERT_TRUE(tab->NavigateToURL(test_url)); |
91 | 81 |
92 // See comment above TestingInstance in ppapi/test/testing_instance.h. | 82 // See comment above TestingInstance in ppapi/test/testing_instance.h. |
93 // Basically it sets a series of numbered cookies. The value of "..." means | 83 // Basically it sets a series of numbered cookies. The value of "..." means |
(...skipping 18 matching lines...) Expand all Loading... |
112 << "Plugin couldn't be loaded. Make sure the PPAPI test plugin is " | 102 << "Plugin couldn't be loaded. Make sure the PPAPI test plugin is " |
113 << "built, in the right place, and doesn't have any missing symbols."; | 103 << "built, in the right place, and doesn't have any missing symbols."; |
114 } else { | 104 } else { |
115 ASSERT_FALSE(progress.empty()) << "Test timed out."; | 105 ASSERT_FALSE(progress.empty()) << "Test timed out."; |
116 } | 106 } |
117 | 107 |
118 EXPECT_STREQ("PASS", progress.c_str()); | 108 EXPECT_STREQ("PASS", progress.c_str()); |
119 } | 109 } |
120 }; | 110 }; |
121 | 111 |
| 112 // In-process plugin test runner. See OutOfProcessPPAPITest below for the |
| 113 // out-of-process version. |
| 114 class PPAPITest : public PPAPITestBase { |
| 115 public: |
| 116 PPAPITest() { |
| 117 // Append the switch to register the pepper plugin. |
| 118 // library name = <out dir>/<test_name>.<library_extension> |
| 119 // MIME type = application/x-ppapi-<test_name> |
| 120 FilePath plugin_dir; |
| 121 EXPECT_TRUE(PathService::Get(base::DIR_EXE, &plugin_dir)); |
| 122 |
| 123 FilePath plugin_lib = plugin_dir.Append(library_name); |
| 124 EXPECT_TRUE(file_util::PathExists(plugin_lib)); |
| 125 FilePath::StringType pepper_plugin = plugin_lib.value(); |
| 126 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); |
| 127 launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins, |
| 128 pepper_plugin); |
| 129 } |
| 130 |
| 131 std::string BuildQuery(const std::string& base, |
| 132 const std::string& test_case){ |
| 133 return StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str()); |
| 134 } |
| 135 |
| 136 }; |
| 137 |
122 // Variant of PPAPITest that runs plugins out-of-process to test proxy | 138 // Variant of PPAPITest that runs plugins out-of-process to test proxy |
123 // codepaths. | 139 // codepaths. |
124 class OutOfProcessPPAPITest : public PPAPITest { | 140 class OutOfProcessPPAPITest : public PPAPITest { |
125 public: | 141 public: |
126 OutOfProcessPPAPITest() { | 142 OutOfProcessPPAPITest() { |
127 // Run PPAPI out-of-process to exercise proxy implementations. | 143 // Run PPAPI out-of-process to exercise proxy implementations. |
128 launch_arguments_.AppendSwitch(switches::kPpapiOutOfProcess); | 144 launch_arguments_.AppendSwitch(switches::kPpapiOutOfProcess); |
129 } | 145 } |
130 }; | 146 }; |
131 | 147 |
| 148 // NaCl plugin test runner. |
| 149 class PPAPINaClTest : public PPAPITestBase { |
| 150 public: |
| 151 PPAPINaClTest() { |
| 152 FilePath plugin_lib; |
| 153 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); |
| 154 EXPECT_TRUE(file_util::PathExists(plugin_lib)); |
| 155 |
| 156 // Enable running NaCl outside of the store. |
| 157 launch_arguments_.AppendSwitch(switches::kEnableNaCl); |
| 158 } |
| 159 |
| 160 // Append the correct mode and testcase string |
| 161 std::string BuildQuery(const std::string& base, |
| 162 const std::string& test_case) { |
| 163 return StringPrintf("%smode=nacl&testcase=%s", base.c_str(), |
| 164 test_case.c_str()); |
| 165 } |
| 166 }; |
| 167 |
| 168 |
132 // Use these macros to run the tests for a specific interface. | 169 // Use these macros to run the tests for a specific interface. |
133 // Most interfaces should be tested with both macros. | 170 // Most interfaces should be tested with both macros. |
134 #define TEST_PPAPI_IN_PROCESS(test_name) \ | 171 #define TEST_PPAPI_IN_PROCESS(test_name) \ |
135 TEST_F(PPAPITest, test_name) { \ | 172 TEST_F(PPAPITest, test_name) { \ |
136 RunTest(#test_name); \ | 173 RunTest(#test_name); \ |
137 } | 174 } |
138 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ | 175 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ |
139 TEST_F(OutOfProcessPPAPITest, test_name) { \ | 176 TEST_F(OutOfProcessPPAPITest, test_name) { \ |
140 RunTest(#test_name); \ | 177 RunTest(#test_name); \ |
141 } | 178 } |
142 | 179 |
143 // Similar macros that test over HTTP. | 180 // Similar macros that test over HTTP. |
144 #define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \ | 181 #define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \ |
145 TEST_F(PPAPITest, test_name) { \ | 182 TEST_F(PPAPITest, test_name) { \ |
146 RunTestViaHTTP(#test_name); \ | 183 RunTestViaHTTP(#test_name); \ |
147 } | 184 } |
148 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \ | 185 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \ |
149 TEST_F(OutOfProcessPPAPITest, test_name) { \ | 186 TEST_F(OutOfProcessPPAPITest, test_name) { \ |
150 RunTestViaHTTP(#test_name); \ | 187 RunTestViaHTTP(#test_name); \ |
151 } | 188 } |
152 | 189 |
153 | 190 |
| 191 // NaCl based PPAPI tests |
| 192 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \ |
| 193 TEST_F(PPAPINaClTest, test_name) { \ |
| 194 RunTestViaHTTP(#test_name); \ |
| 195 } |
| 196 |
154 // | 197 // |
155 // Interface tests. | 198 // Interface tests. |
156 // | 199 // |
157 | 200 |
158 TEST_PPAPI_IN_PROCESS(Broker) | 201 TEST_PPAPI_IN_PROCESS(Broker) |
159 TEST_PPAPI_OUT_OF_PROCESS(Broker) | 202 TEST_PPAPI_OUT_OF_PROCESS(Broker) |
160 | 203 |
161 TEST_PPAPI_IN_PROCESS(Core) | 204 TEST_PPAPI_IN_PROCESS(Core) |
162 TEST_PPAPI_OUT_OF_PROCESS(Core) | 205 TEST_PPAPI_OUT_OF_PROCESS(Core) |
163 | 206 |
164 TEST_PPAPI_IN_PROCESS(CursorControl) | 207 TEST_PPAPI_IN_PROCESS(CursorControl) |
165 TEST_PPAPI_OUT_OF_PROCESS(CursorControl) | 208 TEST_PPAPI_OUT_OF_PROCESS(CursorControl) |
| 209 TEST_PPAPI_NACL_VIA_HTTP(CursorControl) |
166 | 210 |
167 TEST_PPAPI_IN_PROCESS(Instance) | 211 TEST_PPAPI_IN_PROCESS(Instance) |
168 // http://crbug.com/91729 | 212 // http://crbug.com/91729 |
169 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Instance) | 213 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Instance) |
170 | 214 |
171 TEST_PPAPI_IN_PROCESS(Graphics2D) | 215 TEST_PPAPI_IN_PROCESS(Graphics2D) |
172 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) | 216 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) |
| 217 TEST_PPAPI_NACL_VIA_HTTP(Graphics2D) |
173 | 218 |
174 TEST_PPAPI_IN_PROCESS(ImageData) | 219 TEST_PPAPI_IN_PROCESS(ImageData) |
175 TEST_PPAPI_OUT_OF_PROCESS(ImageData) | 220 TEST_PPAPI_OUT_OF_PROCESS(ImageData) |
| 221 TEST_PPAPI_NACL_VIA_HTTP(ImageData) |
176 | 222 |
177 TEST_PPAPI_IN_PROCESS(Buffer) | 223 TEST_PPAPI_IN_PROCESS(Buffer) |
178 TEST_PPAPI_OUT_OF_PROCESS(Buffer) | 224 TEST_PPAPI_OUT_OF_PROCESS(Buffer) |
179 | 225 |
180 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader) | 226 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader) |
181 | |
182 // http://crbug.com/89961 | 227 // http://crbug.com/89961 |
183 #if defined(OS_WIN) | 228 #if defined(OS_WIN) |
184 // It often takes too long time (and fails otherwise) on Windows. | 229 // It often takes too long time (and fails otherwise) on Windows. |
185 #define MAYBE_URLLoader DISABLED_URLLoader | 230 #define MAYBE_URLLoader DISABLED_URLLoader |
186 #else | 231 #else |
187 #define MAYBE_URLLoader FAILS_URLLoader | 232 #define MAYBE_URLLoader FAILS_URLLoader |
188 #endif | 233 #endif |
189 | |
190 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) { | 234 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) { |
191 RunTestViaHTTP("URLLoader"); | 235 RunTestViaHTTP("URLLoader"); |
192 } | 236 } |
193 | 237 |
| 238 |
| 239 |
194 TEST_PPAPI_IN_PROCESS(PaintAggregator) | 240 TEST_PPAPI_IN_PROCESS(PaintAggregator) |
195 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) | 241 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) |
| 242 TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator) |
196 | 243 |
197 TEST_PPAPI_IN_PROCESS(Scrollbar) | 244 TEST_PPAPI_IN_PROCESS(Scrollbar) |
198 // http://crbug.com/89961 | 245 // http://crbug.com/89961 |
199 TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) { | 246 TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) { |
200 RunTest("Scrollbar"); | 247 RunTest("Scrollbar"); |
201 } | 248 } |
| 249 TEST_PPAPI_NACL_VIA_HTTP(Scrollbar) |
202 | 250 |
203 TEST_PPAPI_IN_PROCESS(URLUtil) | 251 TEST_PPAPI_IN_PROCESS(URLUtil) |
204 TEST_PPAPI_OUT_OF_PROCESS(URLUtil) | 252 TEST_PPAPI_OUT_OF_PROCESS(URLUtil) |
205 | 253 |
206 TEST_PPAPI_IN_PROCESS(CharSet) | 254 TEST_PPAPI_IN_PROCESS(CharSet) |
207 TEST_PPAPI_OUT_OF_PROCESS(CharSet) | 255 TEST_PPAPI_OUT_OF_PROCESS(CharSet) |
208 | 256 |
209 TEST_PPAPI_IN_PROCESS(Crypto) | 257 TEST_PPAPI_IN_PROCESS(Crypto) |
210 TEST_PPAPI_OUT_OF_PROCESS(Crypto) | 258 TEST_PPAPI_OUT_OF_PROCESS(Crypto) |
211 | 259 |
212 TEST_PPAPI_IN_PROCESS(Var) | 260 TEST_PPAPI_IN_PROCESS(Var) |
213 // http://crbug.com/89961 | 261 // http://crbug.com/89961 |
214 TEST_F(OutOfProcessPPAPITest, FAILS_Var) { | 262 TEST_F(OutOfProcessPPAPITest, FAILS_Var) { |
215 RunTest("Var"); | 263 RunTest("Var"); |
216 } | 264 } |
| 265 TEST_PPAPI_NACL_VIA_HTTP(Var) |
217 | 266 |
218 TEST_PPAPI_IN_PROCESS(VarDeprecated) | 267 TEST_PPAPI_IN_PROCESS(VarDeprecated) |
219 // Disabled because it times out: http://crbug.com/89961 | 268 // Disabled because it times out: http://crbug.com/89961 |
220 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) | 269 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) |
221 | 270 |
222 // Windows defines 'PostMessage', so we have to undef it. | 271 // Windows defines 'PostMessage', so we have to undef it. |
223 #ifdef PostMessage | 272 #ifdef PostMessage |
224 #undef PostMessage | 273 #undef PostMessage |
225 #endif | 274 #endif |
226 TEST_PPAPI_IN_PROCESS(PostMessage) | 275 TEST_PPAPI_IN_PROCESS(PostMessage) |
227 #if !defined(OS_WIN) | 276 #if !defined(OS_WIN) |
228 // Times out on Windows XP: http://crbug.com/95557 | 277 // Times out on Windows XP: http://crbug.com/95557 |
229 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) | 278 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) |
230 #endif | 279 #endif |
231 | 280 |
232 TEST_PPAPI_IN_PROCESS(Memory) | 281 TEST_PPAPI_IN_PROCESS(Memory) |
233 TEST_PPAPI_OUT_OF_PROCESS(Memory) | 282 TEST_PPAPI_OUT_OF_PROCESS(Memory) |
| 283 TEST_PPAPI_NACL_VIA_HTTP(Memory) |
234 | 284 |
235 TEST_PPAPI_IN_PROCESS(VideoDecoder) | 285 TEST_PPAPI_IN_PROCESS(VideoDecoder) |
236 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) | 286 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
237 | 287 |
238 // http://crbug.com/90039 and http://crbug.com/83443 (Mac) | 288 // http://crbug.com/90039 and http://crbug.com/83443 (Mac) |
239 TEST_F(PPAPITest, FAILS_FileIO) { | 289 TEST_F(PPAPITest, FAILS_FileIO) { |
240 RunTestViaHTTP("FileIO"); | 290 RunTestViaHTTP("FileIO"); |
241 } | 291 } |
242 // http://crbug.com/101154 | 292 // http://crbug.com/101154 |
243 TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) { | 293 TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) { |
244 RunTestViaHTTP("FileIO"); | 294 RunTestViaHTTP("FileIO"); |
245 } | 295 } |
| 296 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO) |
| 297 |
246 | 298 |
247 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) | 299 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) |
248 // Disabled because it times out: http://crbug.com/89961 | 300 // Disabled because it times out: http://crbug.com/89961 |
249 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) | 301 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) |
| 302 TEST_PPAPI_NACL_VIA_HTTP(FileRef) |
| 303 |
250 | 304 |
251 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) | 305 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) |
252 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) | 306 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) |
| 307 TEST_PPAPI_NACL_VIA_HTTP(FileSystem) |
253 | 308 |
254 // http://crbug.com/96767 | 309 // http://crbug.com/96767 |
255 #if !defined(OS_MACOSX) | 310 #if !defined(OS_MACOSX) |
256 TEST_F(PPAPITest, FLAKY_FlashFullscreen) { | 311 TEST_F(PPAPITest, FLAKY_FlashFullscreen) { |
257 RunTestViaHTTP("FlashFullscreen"); | 312 RunTestViaHTTP("FlashFullscreen"); |
258 } | 313 } |
259 TEST_F(OutOfProcessPPAPITest, FLAKY_FlashFullscreen) { | 314 TEST_F(OutOfProcessPPAPITest, FLAKY_FlashFullscreen) { |
260 RunTestViaHTTP("FlashFullscreen"); | 315 RunTestViaHTTP("FlashFullscreen"); |
261 } | 316 } |
262 // New implementation only honors fullscreen requests within a context of | 317 // New implementation only honors fullscreen requests within a context of |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 RunTest("UMA"); | 364 RunTest("UMA"); |
310 } | 365 } |
311 | 366 |
312 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) | 367 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) |
313 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) | 368 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) |
314 | 369 |
315 // PPB_TCPSocket_Private currently isn't supported in-process. | 370 // PPB_TCPSocket_Private currently isn't supported in-process. |
316 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { | 371 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { |
317 RunTestViaHTTP("TCPSocketPrivate"); | 372 RunTestViaHTTP("TCPSocketPrivate"); |
318 } | 373 } |
OLD | NEW |