Enable new FTP for Windows TestShell so that the results of block-test.html a...

webkit/tools/test_shell/test_shell_request_context.cc

 // Copyright (c) 2006-2008 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 "webkit/tools/test_shell/test_shell_request_context.h"
 
-#include "base/command_line.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/tools/test_shell/test_shell_switches.h"
 
 TestShellRequestContext::TestShellRequestContext() {
   Init(std::wstring(), net::HttpCache::NORMAL, false);
 }
 
 TestShellRequestContext::TestShellRequestContext(
     const std::wstring& cache_path,
     net::HttpCache::Mode cache_mode,
     bool no_proxy) {
   Init(cache_path, cache_mode, no_proxy);
@@ skipping 27 matching lines @@
 
   net::HttpCache *cache;
   if (cache_path.empty()) {
     cache = new net::HttpCache(host_resolver_, proxy_service_, 0);
   } else {
     cache = new net::HttpCache(host_resolver_, proxy_service_, cache_path, 0);
   }
   cache->set_mode(cache_mode);
   http_transaction_factory_ = cache;
 
-  // The kNewFtp switch is Windows specific only because we have multiple FTP
-  // implementations on Windows.
-#if defined(OS_WIN)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(test_shell::kNewFtp))
-    ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
-#else
   ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
-#endif
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
   delete cookie_store_;
   delete ftp_transaction_factory_;
   delete http_transaction_factory_;
   delete proxy_service_;
 }
 
 const std::string& TestShellRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }