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

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 120 matching lines @@
 std::string GetResponseDescription(const WebURLResponse& response) {
   if (response.isNull())
     return "(null)";
 
   return StringPrintf("<NSURLResponse %s, http status code %d>",
       GURL(response.url()).possibly_invalid_spec().c_str(),
       response.httpStatusCode());
 }
 
 std::string GetErrorDescription(const WebURLError& error) {
-  std::string domain;
-  int code;
+  std::string domain = UTF16ToASCII(error.domain);
+  int code = error.reason;
 
-  if (EqualsASCII(error.domain, net::kErrorDomain)) {
+  if (domain == net::kErrorDomain) {
     domain = "NSURLErrorDomain";
     switch (error.reason) {
       case net::ERR_ABORTED:
         code = -999;
         break;
       case net::ERR_UNSAFE_PORT:
         // Our unsafe port checking happens at the network stack level, but we
         // make this translation here to match the behavior of stock WebKit.
         domain = "WebKitErrorDomain";
         code = 103;
         break;
       case net::ERR_ADDRESS_INVALID:
+      case net::ERR_ADDRESS_UNREACHABLE:
         code = -1004;
         break;
-      default:
-        code = -1;
     }
   } else {
     DLOG(WARNING) << "Unknown error domain";
-    domain = UTF16ToASCII(error.domain);
-    code = error.reason;
   }
 
   return StringPrintf("<NSError domain %s, code %d, failing URL \"%s\">",
       domain.c_str(), code, error.unreachableURL.spec().data());
 }
 
 }  // namespace
 
 // WebViewDelegate -----------------------------------------------------------
 
@@ skipping 817 matching lines @@
       return L"main frame \"" + name + L"\"";
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }