Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/chrome_paths.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a617d04ffa3187220e80f9ad75d4af692b1fdc65..469d059ef84b5d30f1aa2cac5262d07898a0db87 100644
--- a/chrome/browser/extensions/extension_websocket_apitest.cc
+++ b/chrome/browser/extensions/extension_websocket_apitest.cc
@@ -11,9 +11,8 @@
// Disabled, http://crbug.com/91058.
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) {
FilePath websocket_root_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir);
- websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests")
- .AppendASCII("LayoutTests");
+ ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir));
+
ui_test_utils::TestWebSocketServer server;
ASSERT_TRUE(server.Start(websocket_root_dir));
ASSERT_TRUE(RunExtensionTest("websocket")) << message_;
« no previous file with comments | « no previous file | chrome/common/chrome_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698