Revert "Removing WebContents::GetRenderProcessHost() method."
This reverts commit 4229f25c347aa64f01d932dd23856e44eae6d7a6.
Reason for revert:
Findit (https://goo.gl/kROfz5) identified CL at revision 504862 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzQyMjlmMjVjMzQ3YWE2NGYwMWQ5MzJkZDIzODU2ZTQ0ZWFlNmQ3YTYM
Sample Failed Build: https://luci-milo.appspot.com/buildbot/chromium.win/Win%20x64%20Builder/38179
Original change's description:
> Removing WebContents::GetRenderProcessHost() method.
>
> WebContents::GetRenderProcessHost is an API that doesn't behave as
> expected with out-of-process iframes, as multiple processes can be
> associated with a single WebContents. This CL removes this API
> altogether.
>
> This CL was started by using an ad-hoc clang-plugin that replaced
> existing callsites of WebContents::GetRenderProcessHost() with a call to
> something like wc->GetMainFrame()->GetProcess(). This was followed-up
> by manually adding an include of render_frame_host.h and git cl format
> and git cl lint and then a self-review with small tweaks (e.g. sometimes
> using a wc->GetRenderViewHost()->GetProcess() is more appropriate).
>
> For the record, below is a list of existing bugs that have been
> uncovered or highlighted during the review of this CL:
> - https://crbug.com/715924: Headless OOPIF support
> - https://crbug.com/767519: Android WebView code duplication
> - https://crbug.com/767526: Handling of unresponsive renderers
> - https://crbug.com/767539: TabSpecificContentSettings
> - https://crbug.com/767557: ExtensionMsg_UpdateTabSpecificPermissions
> - https://crbug.com/767563: chrome.processes.getProcessIdForTab
> - https://crbug.com/769385: WebViewInternalAddContentScriptsFunction
> - https://crbug.com/769461: BrowserTag/WebView owner tracking
> - https://crbug.com/769479: PrintPreviewDialogController
>
> Bug: 666525
> Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
> Change-Id: Idcb70a8c3928f0631a38a61b7029876fdaf921cb
> Tbr: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
> Tbr: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
> Reviewed-on: https://chromium-review.googlesource.com/673124
> Reviewed-by: Justin DeWitt <[email protected]>
> Reviewed-by: Mustafa Emre Acer <[email protected]>
> Reviewed-by: Stanislav Chiknavaryan <[email protected]>
> Reviewed-by: Istiaque Ahmed <[email protected]>
> Reviewed-by: Nathan Parker <[email protected]>
> Reviewed-by: David Vallet <[email protected]>
> Reviewed-by: Scott Violet <[email protected]>
> Reviewed-by: Lei Zhang <[email protected]>
> Reviewed-by: Lucas Gadani <[email protected]>
> Reviewed-by: Bo <[email protected]>
> Reviewed-by: Dan Erat <[email protected]>
> Reviewed-by: Avi Drissman <[email protected]>
> Reviewed-by: Nick Carter <[email protected]>
> Commit-Queue: Łukasz Anforowicz <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#504862}
Change-Id: I389fcfe03f5ed41366855d1340f767d89592408c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 666525
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Reviewed-on: https://chromium-review.googlesource.com/688759
Reviewed-by: Łukasz Anforowicz <[email protected]>
Commit-Queue: Łukasz Anforowicz <[email protected]>
Cr-Commit-Position: refs/heads/master@{#504868}diff --git a/chrome/browser/safe_browsing/ui_manager_unittest.cc b/chrome/browser/safe_browsing/ui_manager_unittest.cc
index 56458de..fa3b0b8 100644
--- a/chrome/browser/safe_browsing/ui_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/ui_manager_unittest.cc
@@ -7,6 +7,7 @@
#include "base/run_loop.h"
#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
#include "chrome/browser/safe_browsing/test_safe_browsing_service.h"
+#include "chrome/browser/safe_browsing/ui_manager.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
@@ -14,7 +15,6 @@
#include "components/safe_browsing/db/util.h"
#include "components/security_interstitials/core/base_safe_browsing_error_ui.h"
#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
@@ -119,7 +119,7 @@
resource.is_subresource = is_subresource;
resource.web_contents_getter =
security_interstitials::UnsafeResource::GetWebContentsGetter(
- web_contents()->GetMainFrame()->GetProcess()->GetID(),
+ web_contents()->GetRenderProcessHost()->GetID(),
web_contents()->GetMainFrame()->GetRoutingID());
resource.threat_type = SB_THREAT_TYPE_URL_MALWARE;
return resource;
