chrome/browser/extensions/extension_websocket_apitest.cc - Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test

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 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

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 "chrome/browser/extensions/extension_apitest.h"	5 #include "chrome/browser/extensions/extension_apitest.h"

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

7 #include "net/base/test_data_directory.h"

8 #include "net/dns/mock_host_resolver.h"	7 #include "net/dns/mock_host_resolver.h"

	8 #include "net/test/test_data_directory.h"

9	9

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

11 ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory()));	11 ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory()));

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

13 }	13 }

OLD	NEW