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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/extension_websocket_apitest.cc

Issue 11091059: Revert 161304 - WebSocket test server migration on ExtensionApiTest.WebSocket (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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/path_service.h"	5 #include "base/path_service.h"

6 #include "chrome/browser/extensions/extension_apitest.h"	6 #include "chrome/browser/extensions/extension_apitest.h"

7 #include "content/public/common/content_paths.h"	7 #include "content/public/common/content_paths.h"

8 #include "net/base/mock_host_resolver.h"	8 #include "net/base/mock_host_resolver.h"

9	9

10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {	10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {

11 ASSERT_TRUE(StartWebSocketServer(	11 FilePath websocket_root_dir;

12 FilePath(FILE_PATH_LITERAL("net/data/websocket"))));	12 ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));

	13 ASSERT_TRUE(StartWebSocketServer(websocket_root_dir));

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

14 }	15 }

OLD	NEW

« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/test/data/extensions/api_test/websocket/test.js » ('j') | no next file with comments »