Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1149)

Unified Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 165091: Enable new FTP for Windows TestShell so that the results of block-test.html a... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_webview_delegate.cc
===================================================================
--- webkit/tools/test_shell/test_webview_delegate.cc (revision 22683)
+++ webkit/tools/test_shell/test_webview_delegate.cc (working copy)
@@ -138,10 +138,10 @@
}
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:
@@ -154,15 +154,12 @@
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\">",
« no previous file with comments | « webkit/tools/test_shell/test_shell_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698