Add chrome::DIR_LAYOUT_TESTS to PathService::Get

chrome/browser/extensions/extension_websocket_apitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/path_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
 // 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");
+  // Gets layout tests root. For the current git workflow, this is
+  //  third_party/WebKit/LayoutTests
+  // On svn workflow (including build machines) and older git workflow, this is
+  //  chrome/test/data/layout_tests/LayoutTests
+  FilePath webkit_layout_tests;
+  PathService::Get(base::DIR_SOURCE_ROOT, &webkit_layout_tests);

[Paweł Hajdan Jr., 2011/11/22 13:48:52]

Check the return value, here and below.

[Takashi Toyoshima, 2011/11/22 13:56:59]

Done.

+  webkit_layout_tests = webkit_layout_tests.AppendASCII("third_party");
+  webkit_layout_tests = webkit_layout_tests.AppendASCII("WebKit");
+  webkit_layout_tests = webkit_layout_tests.AppendASCII("LayoutTests");
+  if (!file_util::DirectoryExists(webkit_layout_tests)) {
+    PathService::Get(chrome::DIR_TEST_DATA, &webkit_layout_tests);
+    webkit_layout_tests = webkit_layout_tests.AppendASCII("layout_tests");
+    webkit_layout_tests = webkit_layout_tests.AppendASCII("LayoutTests");
+  }
+
   ui_test_utils::TestWebSocketServer server;
-  ASSERT_TRUE(server.Start(websocket_root_dir));
+  ASSERT_TRUE(server.Start(webkit_layout_tests));
   ASSERT_TRUE(RunExtensionTest("websocket")) << message_;
 }