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

content/public/browser/content_browser_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/navigation_throttle.h"
@@ skipping 232 matching lines @@
   // This also applies in cases where the new URL will open in another process.
   virtual bool ShouldAllowOpenURL(SiteInstance* site_instance, const GURL& url);
 
   // Allows the embedder to override parameters when navigating. Called for both
   // opening new URLs and when transferring URLs across processes.
   virtual void OverrideNavigationParams(SiteInstance* site_instance,
                                         ui::PageTransition* transition,
                                         bool* is_renderer_initiated,
                                         content::Referrer* referrer) {}
 
-  // Called in TopDocumentIsolation mode to let the embedder decide whether the
-  // subframe navigation tracked by |navigation_handle| should end up isolated
-  // from the main content.
-  //
-  // The subframe navigation in question is always to a URL that is cross-site
-  // from the top-level frame.  |main_frame_site_instance| is the SiteInstance
-  // of the top-level frame.
-  virtual bool ShouldIsolateFrameForTopDocumentIsolation(
-      NavigationHandle* navigation_handle,
-      SiteInstance* main_frame_site_instance);
+  // Allows the embedder to override top document isolation for specific frames.
+  // |url| is the URL being loaded in the subframe, and |parent_site_instance|
+  // is the SiteInstance of the parent frame. Called only for subframes and only
+  // when top document isolation mode is enabled.
+  virtual bool ShouldFrameShareParentSiteInstanceDespiteTopDocumentIsolation(
+      const GURL& url,
+      SiteInstance* parent_site_instance);
 
   // Returns whether a new view for a given |site_url| can be launched in a
   // given |process_host|.
   virtual bool IsSuitableHost(RenderProcessHost* process_host,
                               const GURL& site_url);
 
   // Returns whether a new view for a new site instance can be added to a
   // given |process_host|.
   virtual bool MayReuseHost(RenderProcessHost* process_host);
 
@@ skipping 542 matching lines @@
   // Allows the embedder to register one or more URLLoaderThrottles for a
   // URL request. This is used only when --enable-network-service is in effect.
   // This is called on the IO thread.
   virtual std::vector<std::unique_ptr<URLLoaderThrottle>>
   CreateURLLoaderThrottles(const base::Callback<WebContents*()>& wc_getter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_