Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 5269e0dc97a97404bcdac56b2dd442a1dab5c7b7..3661cf6a79414cf5aef39425e2bb86591ebc448f 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -405,10 +405,6 @@ bool NavigatorImpl::NavigateToEntry(
               controller_->GetIndexOfEntry(&entry),
               controller_->GetLastCommittedEntryIndex(),
               controller_->GetEntryCount()));
-    } else {
-      // No need to navigate again.  Just resume the deferred request.

[nasko, 2016/09/08 23:45:39]

Why do we not need this anymore?

[clamy, 2016/09/09 15:06:41]

Because if we transfer to self, we won't pause the navigation in the
NavigationResourceThrottle. See the doc I've included for more info.

-      dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
-          entry.transferred_global_request_id());
     }
   }