diff options
| author | tburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 16:28:38 +0000 |
|---|---|---|
| committer | tburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 16:28:38 +0000 |
| commit | 7923b545f7f92d56e8f1c34d281018c5384a62ee (patch) | |
| tree | acb33b40a4fa705dce9f579375249f1dd6e4846f | |
| parent | 1bf1b5e28a0e2e0427ded1512fd76043087f9ea4 (diff) | |
| download | chromium_src-7923b545f7f92d56e8f1c34d281018c5384a62ee.zip chromium_src-7923b545f7f92d56e8f1c34d281018c5384a62ee.tar.gz chromium_src-7923b545f7f92d56e8f1c34d281018c5384a62ee.tar.bz2 | |
Merge 268180 "Fix bug in PrerenderLocalPredictor"
> Fix bug in PrerenderLocalPredictor
> Only access sb_manager if it was actually created and is not NULL.
> BUG=369494
> R=cbentzel@chromium.org
>
> Review URL: https://codereview.chromium.org/265273003
TBR=tburkard@chromium.org
Review URL: https://codereview.chromium.org/285433005
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@269794 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/prerender/prerender_local_predictor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc index e7ac0fb..be7e1e2 100644 --- a/chrome/browser/prerender/prerender_local_predictor.cc +++ b/chrome/browser/prerender/prerender_local_predictor.cc @@ -1163,7 +1163,7 @@ void PrerenderLocalPredictor::ContinuePrerenderCheck( continue; } #if defined(FULL_SAFE_BROWSING) - if (!SkipLocalPredictorWhitelist() && + if (!SkipLocalPredictorWhitelist() && sb_db_manager && sb_db_manager->CheckSideEffectFreeWhitelistUrl(url_info->url)) { // If a page is on the side-effect free whitelist, we will just prerender // it without any additional checks. |