Fix regression in which NPRES_NETWORK_ERR instead of NPRES_USER_BREAK was pas...

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2009 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 "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
+#include "net/base/net_errors.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebCString.h"
 #include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebData.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebHTTPBody.h"
 #include "webkit/api/public/WebHTTPHeaderVisitor.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebKitClient.h"
 #include "webkit/api/public/WebPluginContainer.h"
 #include "webkit/api/public/WebPluginParams.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebURL.h"
+#include "webkit/api/public/WebURLError.h"
 #include "webkit/api/public/WebURLLoader.h"
 #include "webkit/api/public/WebURLLoaderClient.h"
 #include "webkit/api/public/WebURLResponse.h"
 #include "webkit/api/public/WebView.h"
 #include "webkit/glue/multipart_response_delegate.h"
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webplugin_page_delegate.h"
@@ skipping 311 matching lines @@
 void WebPluginImpl::didFinishLoadingFrameRequest(
     const WebURL& url, void* notify_data) {
   if (delegate_) {
     delegate_->DidFinishLoadWithReason(
         url, NPRES_DONE, reinterpret_cast<intptr_t>(notify_data));
   }
 }
 
 void WebPluginImpl::didFailLoadingFrameRequest(
     const WebURL& url, void* notify_data, const WebURLError& error) {
-  // TODO(darin): Map net::ERR_ABORTED to NPRES_USER_BREAK?
-  if (delegate_) {
-    delegate_->DidFinishLoadWithReason(
-        url, NPRES_NETWORK_ERR, reinterpret_cast<intptr_t>(notify_data));
-  }
+  if (!delegate_)
+    return;
+
+  NPReason reason =
+      error.reason == net::ERR_ABORTED ? NPRES_USER_BREAK : NPRES_NETWORK_ERR;
+  delegate_->DidFinishLoadWithReason(
+      url, reason, reinterpret_cast<intptr_t>(notify_data));
 }
 
 // -----------------------------------------------------------------------------
 
 WebPluginImpl::WebPluginImpl(
     WebFrame* webframe, const WebPluginParams& params,
     const base::WeakPtr<WebPluginPageDelegate>& page_delegate)
     : windowless_(false),
       window_(NULL),
       page_delegate_(page_delegate),
@@ skipping 675 matching lines @@
     client_index = clients_.erase(client_index);
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_ = NULL;
   method_factory_.RevokeAll();
 }
 
 }  // namespace webkit_glue