Revert of Use FrameIsAd to decide whether to isolate a frame in TopDocumentIsolation mode.

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

 // Copyright 2014 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/extensions/chrome_content_browser_client_extensions_part.h"
 
 #include <stddef.h>
 
-#include <memory>
 #include <set>
-#include <string>
-#include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 657 matching lines @@
   if (!vpn_service)
     return nullptr;
   return vpn_service->GetVpnServiceProxy();
 #else
   return nullptr;
 #endif
 }
 
 // static
 bool ChromeContentBrowserClientExtensionsPart::
-    IsMainFrameSiteInstanceExcludedFromTopDocumentIsolation(
-        content::SiteInstance* main_frame_site_instance) {
-  // Disable TDI if the main frame's SiteInstance is a hosted app.
-  // See also https://crbug.com/679011.
+    ShouldFrameShareParentSiteInstanceDespiteTopDocumentIsolation(
+        const GURL& subframe_url,
+        content::SiteInstance* parent_site_instance) {
   const Extension* extension =
-      ExtensionRegistry::Get(main_frame_site_instance->GetBrowserContext())
+      ExtensionRegistry::Get(parent_site_instance->GetBrowserContext())
           ->enabled_extensions()
-          .GetExtensionOrAppByURL(main_frame_site_instance->GetSiteURL());
+          .GetExtensionOrAppByURL(parent_site_instance->GetSiteURL());
+
   return extension && extension->is_hosted_app();
 }
 
 // static
 void ChromeContentBrowserClientExtensionsPart::RecordShouldAllowOpenURLFailure(
     ShouldAllowOpenURLFailureReason reason,
     const GURL& site_url) {
   UMA_HISTOGRAM_ENUMERATION("Extensions.ShouldAllowOpenURL.Failure", reason,
                             FAILURE_LAST);
 
@@ skipping 177 matching lines @@
     command_line->AppendSwitch(switches::kExtensionProcess);
   }
 }
 
 void ChromeContentBrowserClientExtensionsPart::ResourceDispatcherHostCreated() {
   content::ResourceDispatcherHost::Get()->RegisterInterceptor(
       "Origin", kExtensionScheme, base::Bind(&OnHttpHeaderReceived));
 }
 
 }  // namespace extensions