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

chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer.cc

 // Copyright 2017 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/page_load_metrics/observers/ads_page_load_metrics_observer.h"
 
 #include <string>
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
+#include "chrome/browser/page_load_metrics/observers/ads_detection.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace {
 
 const base::Feature kAdsFeature{"AdsMetrics", base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ skipping 21 matching lines @@
   // In case the navigation aborted, look up the RFH by the Frame Tree Node
   // ID. It returns the committed frame host or the initial frame host for the
   // frame if no committed host exists. Using a previous host is fine because
   // once a frame has an ad we always consider it to have an ad.
   // We use the unsafe method of FindFrameByFrameTreeNodeId because we're not
   // concerned with which process the frame lives on (we're just measuring
   // bytes and not granting security priveleges).
   content::RenderFrameHost* current_frame_host =
       navigation_handle->GetWebContents()->UnsafeFindFrameByFrameTreeNodeId(
           navigation_handle->GetFrameTreeNodeId());
-  if (current_frame_host) {
-    const std::string& frame_name = current_frame_host->GetFrameName();
-    if (base::StartsWith(frame_name, "google_ads_iframe",
-                         base::CompareCase::SENSITIVE) ||
-        base::StartsWith(frame_name, "google_ads_frame",
-                         base::CompareCase::SENSITIVE)) {
-      return true;
-    }
-  }
 
-  const GURL& url = navigation_handle->GetURL();
-  return url.host_piece() == "tpc.googlesyndication.com" &&
-         base::StartsWith(url.path_piece(), "/safeframe",
-                          base::CompareCase::SENSITIVE);
+  return IsAdFrame(current_frame_host ? current_frame_host->GetFrameName() : "",
+                   navigation_handle->GetURL());
 }
 
 void RecordParentExistsForSubFrame(
     bool parent_exists,
     const AdsPageLoadMetricsObserver::AdTypes& ad_types) {
   ADS_HISTOGRAM("ParentExistsForSubFrame", UMA_HISTOGRAM_BOOLEAN,
                 AdsPageLoadMetricsObserver::AD_TYPE_ALL, parent_exists);
 }
 
 }  // namespace
@@ skipping 288 matching lines @@
 void AdsPageLoadMetricsObserver::ProcessOngoingNavigationResource(
     FrameTreeNodeId frame_tree_node_id) {
   const auto& frame_id_and_request =
       ongoing_navigation_resources_.find(frame_tree_node_id);
   if (frame_id_and_request == ongoing_navigation_resources_.end())
     return;
 
   ProcessLoadedResource(frame_id_and_request->second);
   ongoing_navigation_resources_.erase(frame_id_and_request);
 }