Move DidFailProvisionalLoad handling from RenderView(Host) to RenderFrame(Host).

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 2146 matching lines @@
 
   if (is_main_frame) {
     FOR_EACH_OBSERVER(
         WebContentsObserver,
         observers_,
         ProvisionalChangeToMainFrameUrl(validated_url,
                                         render_frame_host->render_view_host()));
   }
 }
 
+void WebContentsImpl::DidFailProvisionalLoadWithError(
+    RenderFrameHostImpl* render_frame_host,
+    const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
+  GURL validated_url(params.url);
+  FOR_EACH_OBSERVER(
+      WebContentsObserver,
+      observers_,
+      DidFailProvisionalLoad(params.frame_id,
+                             params.frame_unique_name,
+                             params.is_main_frame,
+                             validated_url,
+                             params.error_code,
+                             params.error_description,
+                             render_frame_host->render_view_host()));
+}
+
 void WebContentsImpl::NotifyChangedNavigationState(
     InvalidateTypes changed_flags) {
   NotifyNavigationStateChanged(changed_flags);
 }
 
 void WebContentsImpl::DidRedirectProvisionalLoad(
     RenderViewHost* render_view_host,
     int32 page_id,
     const GURL& source_url,
     const GURL& target_url) {
@@ skipping 15 matching lines @@
   }
   if (!entry || entry->GetURL() != validated_source_url)
     return;
 
   // Notify observers about the provisional change in the main frame URL.
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     ProvisionalChangeToMainFrameUrl(validated_target_url,
                                                     render_view_host));
 }
 
+/*

[Charlie Reis, 2014/01/06 18:13:35]

Don't forget to delete this now that it's moved.

[nasko, 2014/01/06 18:47:03]

Done.

 void WebContentsImpl::DidFailProvisionalLoadWithError(
     RenderViewHost* render_view_host,
-    const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params) {
+    const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
   VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
           << ", error_code: " << params.error_code
           << ", error_description: " << params.error_description
           << ", is_main_frame: " << params.is_main_frame
           << ", showing_repost_interstitial: " <<
             params.showing_repost_interstitial
           << ", frame_id: " << params.frame_id;
   GURL validated_url(params.url);
   RenderProcessHost* render_process_host =
       render_view_host->GetProcess();
@@ skipping 41 matching lines @@
   FOR_EACH_OBSERVER(WebContentsObserver,
                     observers_,
                     DidFailProvisionalLoad(params.frame_id,
                                            params.frame_unique_name,
                                            params.is_main_frame,
                                            validated_url,
                                            params.error_code,
                                            params.error_description,
                                            render_view_host));
 }
+*/
 
 void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
     const GURL& url,
     const std::string& security_info,
     const std::string& http_method,
     const std::string& mime_type,
     ResourceType::Type resource_type) {
   base::StatsCounter cache("WebKit.CacheHit");
   cache.Increment();
 
@@ skipping 1620 matching lines @@
 }
 
 void WebContentsImpl::OnFrameRemoved(
     RenderViewHostImpl* render_view_host,
     int64 frame_id) {
    FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                      FrameDetached(render_view_host, frame_id));
 }
 
 }  // namespace content