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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8555002: Added NaCl proxy for TCP/UDP (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added PPAPI NaCl tests. Created 9 years 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
OLDNEW
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/browser/plugin_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // NaCl plugin test runner. 192 // NaCl plugin test runner.
193 class PPAPINaClTest : public PPAPITestBase { 193 class PPAPINaClTest : public PPAPITestBase {
194 public: 194 public:
195 PPAPINaClTest() { 195 PPAPINaClTest() {
196 FilePath plugin_lib; 196 FilePath plugin_lib;
197 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); 197 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
198 EXPECT_TRUE(file_util::PathExists(plugin_lib)); 198 EXPECT_TRUE(file_util::PathExists(plugin_lib));
199 199
200 // Enable running NaCl outside of the store. 200 // Enable running NaCl outside of the store.
201 launch_arguments_.AppendSwitch(switches::kEnableNaCl); 201 launch_arguments_.AppendSwitch(switches::kEnableNaCl);
202 launch_arguments_.AppendArg("--allow-nacl-socket-api=127.0.0.1");
polina 2011/11/29 05:20:47 A comment explaining what this flag is for would b
polina 2011/11/29 05:20:47 Is there no switches file where this flag is defin
ygorshenin 2011/11/29 13:25:18 Yes, this flag is defined in CL http://codereview.
polina 2011/11/30 01:26:21 Don't merge the CLs. Just commit them in the right
202 } 203 }
203 204
204 // Append the correct mode and testcase string 205 // Append the correct mode and testcase string
205 std::string BuildQuery(const std::string& base, 206 std::string BuildQuery(const std::string& base,
206 const std::string& test_case) { 207 const std::string& test_case) {
207 return StringPrintf("%smode=nacl&testcase=%s", base.c_str(), 208 return StringPrintf("%smode=nacl&testcase=%s", base.c_str(),
208 test_case.c_str()); 209 test_case.c_str());
209 } 210 }
210 }; 211 };
211 212
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) 285 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D)
285 TEST_PPAPI_NACL_VIA_HTTP(Graphics2D) 286 TEST_PPAPI_NACL_VIA_HTTP(Graphics2D)
286 287
287 TEST_PPAPI_IN_PROCESS(ImageData) 288 TEST_PPAPI_IN_PROCESS(ImageData)
288 TEST_PPAPI_OUT_OF_PROCESS(ImageData) 289 TEST_PPAPI_OUT_OF_PROCESS(ImageData)
289 TEST_PPAPI_NACL_VIA_HTTP(ImageData) 290 TEST_PPAPI_NACL_VIA_HTTP(ImageData)
290 291
291 TEST_PPAPI_IN_PROCESS(Buffer) 292 TEST_PPAPI_IN_PROCESS(Buffer)
292 TEST_PPAPI_OUT_OF_PROCESS(Buffer) 293 TEST_PPAPI_OUT_OF_PROCESS(Buffer)
293 294
295 TEST_PPAPI_NACL_VIA_HTTP(TCPSocketPrivateShared)
polina 2011/11/29 05:20:47 A ppapi test should occur as IN, OUT and NACL. Thi
ygorshenin 2011/11/29 13:25:18 Added TEST_PPAPI_OUT_OF_PROCESS(...). TEST_PPAPI_I
polina 2011/11/30 01:26:21 TEST_PPAPI_IN_PROCESS tests your chrome implementa
296 TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivateShared)
297
294 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader) 298 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader)
295 // http://crbug.com/89961 299 // http://crbug.com/89961
296 #if defined(OS_WIN) 300 #if defined(OS_WIN)
297 // It often takes too long time (and fails otherwise) on Windows. 301 // It often takes too long time (and fails otherwise) on Windows.
298 #define MAYBE_URLLoader DISABLED_URLLoader 302 #define MAYBE_URLLoader DISABLED_URLLoader
299 #else 303 #else
300 #define MAYBE_URLLoader FAILS_URLLoader 304 #define MAYBE_URLLoader FAILS_URLLoader
301 #endif 305 #endif
302 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) { 306 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) {
303 RunTestViaHTTP("URLLoader"); 307 RunTestViaHTTP("URLLoader");
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) 479 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop)
476 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) 480 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
477 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) 481 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
478 482
479 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect) 483 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect)
480 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) 484 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)
481 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect) 485 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect)
482 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive) 486 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive)
483 487
484 #endif // ADDRESS_SANITIZER 488 #endif // ADDRESS_SANITIZER
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698