Move GetSourceFrameForPopup() into an anonymous namespace.

It is only ever used within popup_blocker.cc.

Change-Id: I514eac14d05c8b844242ed93693841c291af4966
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1817661Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699064}

chrome/browser/ui/blocked_content/popup_blocker.cc

@@ -71,6 +71,28 @@ PopupBlockType ShouldBlockPopup(content::WebContents* web_contents,
   return PopupBlockType::kNotBlocked;
 }
 
+// Tries to get the opener from either the |params| or |open_url_params|,
+// otherwise uses the focused frame from |web_contents| as a proxy.
+content::RenderFrameHost* GetSourceFrameForPopup(
+    NavigateParams* params,
+    const content::OpenURLParams* open_url_params,
+    content::WebContents* web_contents) {
+  if (params->opener)
+    return params->opener;
+  // Make sure the source render frame host is alive before we attempt to
+  // retrieve it from |open_url_params|.
+  if (open_url_params) {
+    content::RenderFrameHost* source = content::RenderFrameHost::FromID(
+        open_url_params->source_render_frame_id,
+        open_url_params->source_render_process_id);
+    if (source)
+      return source;
+  }
+  // The focused frame is not always the frame initiating the popup navigation
+  // and is used as a fallback in case opener information is not available.
+  return web_contents->GetFocusedFrame();
+}
+
 }  // namespace
 
 bool ConsiderForPopupBlocking(WindowOpenDisposition disposition) {
@@ -105,23 +127,3 @@ bool MaybeBlockPopup(content::WebContents* web_contents,
   }
   return false;
 }
-
-content::RenderFrameHost* GetSourceFrameForPopup(
-    NavigateParams* params,
-    const content::OpenURLParams* open_url_params,
-    content::WebContents* web_contents) {
-  if (params->opener)
-    return params->opener;
-  // Make sure the source render frame host is alive before we attempt to
-  // retrieve it from |open_url_params|.
-  if (open_url_params) {
-    content::RenderFrameHost* source = content::RenderFrameHost::FromID(
-        open_url_params->source_render_frame_id,
-        open_url_params->source_render_process_id);
-    if (source)
-      return source;
-  }
-  // The focused frame is not always the frame initiating the popup navigation
-  // and is used as a fallback in case opener information is not available.
-  return web_contents->GetFocusedFrame();
-}

chrome/browser/ui/blocked_content/popup_blocker.h

@@ -10,7 +10,6 @@
 #include "url/gurl.h"
 
 namespace content {
-class RenderFrameHost;
 class WebContents;
 struct OpenURLParams;
 }  // namespace content
@@ -48,11 +47,4 @@ bool MaybeBlockPopup(content::WebContents* web_contents,
                      const content::OpenURLParams* open_url_params,
                      const blink::mojom::WindowFeatures& window_features);
 
-// Tries to get the opener from either the |params| or |open_url_params|,
-// otherwise uses the focused frame from |web_contents| as a proxy.
-content::RenderFrameHost* GetSourceFrameForPopup(
-    NavigateParams* params,
-    const content::OpenURLParams* open_url_params,
-    content::WebContents* web_contents);
-
 #endif  // CHROME_BROWSER_UI_BLOCKED_CONTENT_POPUP_BLOCKER_H_