chrome/browser/extensions/extension_websocket_apitest.cc - Issue 3034038: GTTF: Move more test server code from net/url_request/url_request_unittest.h

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 3034038: GTTF: Move more test server code from net/url_request/url_request_unittest.h (Closed)

Patch Set: hopefully final Created 10 years, 4 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

« no previous file with comments | « chrome/browser/extensions/extension_omnibox_apitest.cc ('k') | chrome/browser/extensions/stubs_apitest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "chrome/browser/extensions/extension_apitest.h"	6 #include "chrome/browser/extensions/extension_apitest.h"

6 #include "chrome/common/chrome_paths.h"	7 #include "chrome/common/chrome_paths.h"

7 #include "chrome/test/ui_test_utils.h"	8 #include "chrome/test/ui_test_utils.h"

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

9	10

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

11 FilePath websocket_root_dir;	12 FilePath websocket_root_dir;

12 PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir);	13 PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir);

13 websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests")	14 websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests")

14 .AppendASCII("LayoutTests");	15 .AppendASCII("LayoutTests");

15 ui_test_utils::TestWebSocketServer server(websocket_root_dir);	16 ui_test_utils::TestWebSocketServer server(websocket_root_dir);

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

17 }	18 }

OLD	NEW