Move blocking of top-level navigations to nested URLs with extension origins from non-extension pro…

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 3178 matching lines @@
         auto intent_picker_cb = base::Bind(ShowIntentPickerBubble());
         auto url_to_arc_throttle = base::MakeUnique<arc::ArcNavigationThrottle>(
             handle, intent_picker_cb);
         throttles.push_back(std::move(url_to_arc_throttle));
       }
     }
   }
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
-  if (!handle->IsInMainFrame())
-    throttles.push_back(new extensions::ExtensionNavigationThrottle(handle));
+  throttles.push_back(new extensions::ExtensionNavigationThrottle(handle));
 #endif
 
   subresource_filter::ContentSubresourceFilterDriverFactory*
       subresource_filter_driver_factory =
           subresource_filter::ContentSubresourceFilterDriverFactory::
               FromWebContents(handle->GetWebContents());
   if (subresource_filter_driver_factory && handle->IsInMainFrame() &&
       handle->GetURL().SchemeIsHTTPOrHTTPS()) {
     // TODO(melandory): Activation logic should be moved to the
     // WebContentsObserver, once ReadyToCommitNavigation is available on
@@ skipping 82 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)