Only add navigations that affect user-facing history to visited URLs.

We want to avoid adding anything that isn't in the primary page
to the visited URLs. So fenced frames won't count as a visited URL navigation.

BUG=1218946

Change-Id: If8bba1bedda2e96c7d97731f5b237c80c6e3f660
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3749037
Reviewed-by: Kevin McNee <mcnee@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1021273}

android_webview/browser/renderer_host/aw_render_view_host_ext.cc

@@ -135,13 +135,19 @@ void AwRenderViewHostExt::DidStartNavigation(
 void AwRenderViewHostExt::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  if (!navigation_handle->HasCommitted() ||
-      (!navigation_handle->IsInMainFrame() &&
-       !navigation_handle->HasSubframeNavigationEntryCommitted()))
+
+  if (!navigation_handle->HasCommitted())
     return;
 
-  AwBrowserContext::FromWebContents(web_contents())
-      ->AddVisitedURLs(navigation_handle->GetRedirectChain());
+  // Only record a visit if the navigation affects user-facing session history
+  // (i.e. it occurs in the primary frame tree).
+  if (navigation_handle->IsInPrimaryMainFrame() ||
+      (navigation_handle->GetParentFrame() &&
+       navigation_handle->GetParentFrame()->GetPage().IsPrimary() &&
+       navigation_handle->HasSubframeNavigationEntryCommitted())) {
+    AwBrowserContext::FromWebContents(web_contents())
+        ->AddVisitedURLs(navigation_handle->GetRedirectChain());
+  }
 }
 
 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {