Revert 3 CLs for shouldOverrideUrlLoading implementation.

components/navigation_interception/intercept_navigation_throttle.cc

 // Copyright 2015 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 "components/navigation_interception/intercept_navigation_throttle.h"
 
 #include "components/navigation_interception/navigation_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 
@@ skipping 47 matching lines @@
   return CheckIfShouldIgnoreNavigation(true);
 }
 
 content::NavigationThrottle::ThrottleCheckResult
 InterceptNavigationThrottle::CheckIfShouldIgnoreNavigation(bool is_redirect) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   NavigationParams navigation_params(
       navigation_handle()->GetURL(), navigation_handle()->GetReferrer(),
       navigation_handle()->HasUserGesture(), navigation_handle()->IsPost(),
       navigation_handle()->GetPageTransition(), is_redirect,
-      navigation_handle()->IsExternalProtocol(),
-      navigation_handle()->IsInMainFrame());
+      navigation_handle()->IsExternalProtocol(), true);
 
   if (run_callback_synchronously_) {
     bool should_ignore_navigation = should_ignore_callback_.Run(
         navigation_handle()->GetWebContents(), navigation_params);
     return should_ignore_navigation
                ? content::NavigationThrottle::CANCEL_AND_IGNORE
                : content::NavigationThrottle::PROCEED;
   }
 
   // When the callback can potentially destroy the WebContents, along with the
@@ skipping 34 matching lines @@
     bool should_ignore_navigation) {
   if (should_ignore_navigation) {
     navigation_handle()->CancelDeferredNavigation(
         content::NavigationThrottle::CANCEL_AND_IGNORE);
   } else {
     navigation_handle()->Resume();
   }
 }
 
 }  // namespace navigation_interception