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

Unified Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8642001: Add RunTestWithWebSocketServer for subsequent Pepper WebSocket API tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use PathService::Get(chrome::DIR_LAYOUT_TESTS) Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ppapi_uitest.cc
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index b9397f8744d447173707a8c693e934e77342a628..63eb4d64fba208c7ae7ce817866979c3fe9ee25e 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -12,6 +12,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/automation/tab_proxy.h"
+#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/ui/ui_test.h"
#include "net/base/net_util.h"
#include "net/test/test_server.h"
@@ -106,6 +107,16 @@ class PPAPITestBase : public UITest {
RunTestURL(test_server.GetURL(query));
}
+ void RunTestWithWebSocketServer(const std::string& test_case) {
+ FilePath websocket_root_dir;
+ ASSERT_TRUE(
+ PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir));
+
+ ui_test_utils::TestWebSocketServer server;
+ ASSERT_TRUE(server.Start(websocket_root_dir));
+ RunTest(test_case);
+ }
+
private:
void RunTestURL(const GURL& test_url) {
scoped_refptr<TabProxy> tab(GetActiveTab());
« 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