chrome/browser/extensions/extension_websocket_apitest.cc - Issue 8641002: Add chrome::DIR_LAYOUT_TESTS to PathService::Get

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 8641002: Add chrome::DIR_LAYOUT_TESTS to PathService::Get (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Define chrome::DIR_LAYOUT_TESTS Created 9 years, 1 month 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

« no previous file with comments | « no previous file | chrome/common/chrome_paths.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/common/chrome_paths.h"	7 #include "chrome/common/chrome_paths.h"

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

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

10	10

11 // Disabled, http://crbug.com/91058.	11 // Disabled, http://crbug.com/91058.

12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) {	12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) {

13 FilePath websocket_root_dir;	13 FilePath websocket_root_dir;

14 PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir);	14 ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir));

15 websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests")	15

16 .AppendASCII("LayoutTests");

17 ui_test_utils::TestWebSocketServer server;	16 ui_test_utils::TestWebSocketServer server;

18 ASSERT_TRUE(server.Start(websocket_root_dir));	17 ASSERT_TRUE(server.Start(websocket_root_dir));

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

20 }	19 }

OLD	NEW