| Index: chrome/browser/extensions/extension_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
|
| index 003e7f8dc3ba2df1bff26537092d4397204bb0e6..39aacd7d2b578181e521419f2107bc564c112921 100644
|
| --- a/chrome/browser/extensions/extension_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_apitest.cc
|
| @@ -33,6 +33,7 @@ const char kTestCustomArg[] = "customArg";
|
| const char kTestServerPort[] = "testServer.port";
|
| const char kTestDataDirectory[] = "testDataDirectory";
|
| const char kTestWebSocketPort[] = "testWebSocketPort";
|
| +const char kFtpServerPort[] = "ftpServer.port";
|
| const char kSpawnedTestServerPort[] = "spawnedTestServer.port";
|
|
|
| scoped_ptr<net::test_server::HttpResponse> HandleServerRedirectRequest(
|
| @@ -449,6 +450,21 @@ bool ExtensionApiTest::StartWebSocketServer(
|
| return true;
|
| }
|
|
|
| +bool ExtensionApiTest::StartFTPServer(const base::FilePath& root_directory) {
|
| + ftp_server_.reset(new net::SpawnedTestServer(
|
| + net::SpawnedTestServer::TYPE_FTP,
|
| + net::SpawnedTestServer::kLocalhost,
|
| + root_directory));
|
| +
|
| + if (!ftp_server_->Start())
|
| + return false;
|
| +
|
| + test_config_->SetInteger(kFtpServerPort,
|
| + ftp_server_->host_port_pair().port());
|
| +
|
| + return true;
|
| +}
|
| +
|
| bool ExtensionApiTest::StartSpawnedTestServer() {
|
| if (!test_server()->Start())
|
| return false;
|
|
|