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

Unified Diff: chrome/browser/extensions/extension_websocket_apitest.cc

Issue 11115011: Revert 161572 - WebSocket test server migration on ExtensionApiTest.WebSocket (third trial) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/common/extensions/api/test.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_websocket_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_websocket_apitest.cc (revision 161574)
+++ chrome/browser/extensions/extension_websocket_apitest.cc (working copy)
@@ -8,7 +8,8 @@
#include "net/base/mock_host_resolver.h"
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {
- ASSERT_TRUE(StartWebSocketServer(
- FilePath(FILE_PATH_LITERAL("net/data/websocket"))));
+ FilePath websocket_root_dir;
+ ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));
+ ASSERT_TRUE(StartWebSocketServer(websocket_root_dir));
ASSERT_TRUE(RunExtensionTest("websocket")) << message_;
}
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/common/extensions/api/test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698