Remove calls of PrerenderTracker::TryCancelOnIOThread in SafeBrowsingResourceThrottle and instead P…

Remove calls of PrerenderTracker::TryCancelOnIOThread in SafeBrowsingResourceThrottle and instead PrerenderContents::Destroy directly on the UI thread.

This is part of the work on removing calls to ResourceRequestInfo::GetAssociatedRenderView. The last callers to that method are using it to cancel prerenders if they haven't been used yet, so the checking/cancelling needs to all move to the UI thread.

BUG=304341
[email protected]

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243063

[jam, 2014-01-03 02:57:44]

[email protected]

[jam, 2014-01-03 20:45:54]

Redirecting to David

[davidben, 2014-01-05 02:34:00]

LGTM, although I'm not actually very familiar with the SafeBrowsing code.

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
File chrome/browser/renderer_host/safe_browsing_resource_throttle.cc (left):

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
chrome/browser/renderer_host/safe_browsing_resource_throttle.cc:107: if
(user_data && user_data->is_prerender()) {
(Huh, didn't even know about this thing. Way too many notions of whether a
request is attached to a prerender or not. I hope we'll be able to do away with
some of them after all this churn is done.)

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
File chrome/browser/renderer_host/safe_browsing_resource_throttle.cc (right):

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
chrome/browser/renderer_host/safe_browsing_resource_throttle.cc:145:
content::WebContents::FromRenderViewHost(rvh);
I wonder if we want to move some of these chains into helper functions.
Apparently there's a tab_utils::GetWebContentsByID. Probably can add a
tab_utils::GetWebContentsByFrameID when it switches from RVH to RFH later.

Maybe we can have a PrerenderContents::FromWebContents() for this and
PrerenderResourceThrottle.

[jam, 2014-01-05 07:36:27]

On 2014/01/05 02:34:00, David Benjamin wrote:
> LGTM, although I'm not actually very familiar with the SafeBrowsing code.

I wrote the SB throttle long ago, so I was mostly looking for someone from the
prerendering team to look at the prerendering specific change to make sure it
was correct.

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
File chrome/browser/renderer_host/safe_browsing_resource_throttle.cc (left):

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
chrome/browser/renderer_host/safe_browsing_resource_throttle.cc:107: if
(user_data && user_data->is_prerender()) {
On 2014/01/05 02:34:01, David Benjamin wrote:
> (Huh, didn't even know about this thing. Way too many notions of whether a
> request is attached to a prerender or not. I hope we'll be able to do away
with
> some of them after all this churn is done.)

Yep I'm planning on removing this after
https://codereview.chromium.org/124113003/ lands

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
File chrome/browser/renderer_host/safe_browsing_resource_throttle.cc (right):

https://codereview.chromium.org/103633008/diff/30005/chrome/browser/renderer_...
chrome/browser/renderer_host/safe_browsing_resource_throttle.cc:145:
content::WebContents::FromRenderViewHost(rvh);
On 2014/01/05 02:34:01, David Benjamin wrote:
> I wonder if we want to move some of these chains into helper functions.
> Apparently there's a tab_utils::GetWebContentsByID. Probably can add a
> tab_utils::GetWebContentsByFrameID when it switches from RVH to RFH later.
For RFH I think we don't need another method, since we don't need to null check
before calling WebContents::FromRenderFrameHost. I'm hesitant to add another
method which just calls two existing ones.

> 
> Maybe we can have a PrerenderContents::FromWebContents() for this and
> PrerenderResourceThrottle.

Completely agree. I wanted to add one but for some reason I thought that there
was a reason it wasn't there already. I should have checked or tried sending it
out :) Added now and converted PrerenderResourceThrottle to call it.

[davidben, 2014-01-06 04:13:54]

LGTM.

> I wrote the SB throttle long ago, so I was mostly looking for someone from the
> prerendering team to look at the prerendering specific change to make sure it
> was correct.

Ah, okay.

https://codereview.chromium.org/103633008/diff/340001/chrome/browser/prerende...
File chrome/browser/prerender/prerender_contents.h (right):

https://codereview.chromium.org/103633008/diff/340001/chrome/browser/prerende...
chrome/browser/prerender/prerender_contents.h:152: // prerendering. Otherwise
returns  NULL. Handles a NULL input for
Nit: extra space between 'returns' and 'NULL'.

https://codereview.chromium.org/103633008/diff/340001/chrome/browser/renderer...
File chrome/browser/renderer_host/safe_browsing_resource_throttle.cc (right):

https://codereview.chromium.org/103633008/diff/340001/chrome/browser/renderer...
chrome/browser/renderer_host/safe_browsing_resource_throttle.cc:151: if
(should_show_blocking_page)  {
[ Feel free to ignore this. It's an awfully small amount of code to bikeshedding
over, and you wrote the original one anyway. :-) ]

Hrm, I suppose this could now just be in an else block and
should_show_blocking_page removed.

I wonder if this would be clearer if the "tab is gone" case were handled by
DisplayBlockingPage (as it was before it seems) and the early-return attached to
the prerender case:

  [...]
    if (prerender_contents) {
      prerender_contents->Destroy(prerender::FINAL_STATUS_SAFE_BROWSING);
      content::BrowserThread::PostTask(
          content::BrowserThread::IO,
          FROM_HERE,
          base::Bind(resource.callback, false));
      return;
    }
  }

  ui_manager->DisplayBlockingPage(resource);