chrome/browser/extensions/extension_websocket_apitest.cc - Issue 11087027: WebSocket test server migration on ExtensionApiTest.WebSocket

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11087027: WebSocket test server migration on ExtensionApiTest.WebSocket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add default value for testWebSocketPort 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:

Index: chrome/browser/extensions/extension_websocket_apitest.cc

diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc

index 7017aecf580a1c70e8883b561ed52ef7da24e4f2..cbe9e73b503348ef10bd99fdeb149c383920a2e4 100644

--- a/chrome/browser/extensions/extension_websocket_apitest.cc

+++ b/chrome/browser/extensions/extension_websocket_apitest.cc

@@ -8,8 +8,7 @@

#include "net/base/mock_host_resolver.h"

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {

- FilePath websocket_root_dir;

- ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));

- ASSERT_TRUE(StartWebSocketServer(websocket_root_dir));

+ ASSERT_TRUE(StartWebSocketServer(

+ FilePath(FILE_PATH_LITERAL("net/data/websocket"))));

ASSERT_TRUE(RunExtensionTest("websocket")) << message_;

}