WebSocket test server migration on ExtensionApiTest.WebSocket

chrome/browser/extensions/extension_websocket_apitest.cc

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 7017aecf580a1c70e8883b561ed52ef7da24e4f2..d16f2122d4e05bde177601d6e1e4d777b022a407 100644
--- a/chrome/browser/extensions/extension_websocket_apitest.cc
+++ b/chrome/browser/extensions/extension_websocket_apitest.cc
@@ -8,8 +8,7 @@
 #include "net/base/mock_host_resolver.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {
-  FilePath websocket_root_dir;
-  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));
-  ASSERT_TRUE(StartWebSocketServer(websocket_root_dir));
+  ASSERT_TRUE(StartWebSocketServer(
+      FilePath().AppendASCII("net/data/websocket")));

[Ryan Sleevi, 2012/10/09 19:39:07]

Could you explain why you're no longer using PathService? Are you relying on the
TestServer to have a current working directory of some value? If so, I don't
think that's guaranteed by the test server.

If you really did mean to do this, why not

StartWebSocketServer(FILE_PATH_LITERAL("net/data/websocket"));

Although AIUI, including forward slashes in literals is discouraged

FilePath(FILE_PATH_LITERAL("net"))
    .Append(FILE_PATH_LITERAL("data"))
    .Append(FILE_PATH_LITERAL("websocket"));

[Takashi Toyoshima, 2012/10/10 01:34:48]

I follows BrowserTestBase::CreateTestServer() style here.
I'm not sure why they use relative path, but this runs in the same situation, so
I just keep consistency. I think we should fix them to use PathService and
FilePath().Append()... style.

So could you allow me to keep this as is for now?

[Takashi Toyoshima, 2012/10/10 04:14:41]

The reason of relative path exists in LocalTestServer::Init().
There, document_root.IsAbosolute() check the specified path.
So, the path should be relative here.
Also, BrowserTestBase comment says it's relative to src.

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