| 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\">",
|
|
|