diff options
| author | sreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 18:25:01 +0000 |
|---|---|---|
| committer | sreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 18:25:01 +0000 |
| commit | 3e9f5e16b88f3c633f26c66f245012e916544a67 (patch) | |
| tree | 7221d624dbf48d745d75ad98c6efb3cd686101aa | |
| parent | a5424e95cc07562106e7a8e991c30868b6f4f07d (diff) | |
| download | chromium_src-3e9f5e16b88f3c633f26c66f245012e916544a67.zip chromium_src-3e9f5e16b88f3c633f26c66f245012e916544a67.tar.gz chromium_src-3e9f5e16b88f3c633f26c66f245012e916544a67.tar.bz2 | |
Fix crash in ResourcePrefetcherManager and re-enable field trial.
See the bug for details.
BUG=158056
R=dominich@chromium.org
TEST=Watch crash data. This shouldn't appear anymore.
Review URL: https://chromiumcodereview.appspot.com/11308027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164552 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/predictors/resource_prefetcher_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_field_trial.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/predictors/resource_prefetcher_manager.cc b/chrome/browser/predictors/resource_prefetcher_manager.cc index f5ed30e..b2a4939 100644 --- a/chrome/browser/predictors/resource_prefetcher_manager.cc +++ b/chrome/browser/predictors/resource_prefetcher_manager.cc @@ -94,7 +94,7 @@ void ResourcePrefetcherManager::ResourcePrefetcherFinished( PrefetcherMap::iterator it = prefetcher_map_.find(main_frame_url); DCHECK(it != prefetcher_map_.end()); delete it->second; - prefetcher_map_.erase(main_frame_url); + prefetcher_map_.erase(it); } void ResourcePrefetcherManager::ResourcePrefetcherFinishedOnUI( diff --git a/chrome/browser/prerender/prerender_field_trial.cc b/chrome/browser/prerender/prerender_field_trial.cc index 8dbb1e2..7938dca 100644 --- a/chrome/browser/prerender/prerender_field_trial.cc +++ b/chrome/browser/prerender/prerender_field_trial.cc @@ -264,8 +264,7 @@ void ConfigureSpeculativePrefetching() { case chrome::VersionInfo::CHANNEL_CANARY: case chrome::VersionInfo::CHANNEL_DEV: kLearningProbability = 90; - // Disabled due to http://crbug.com/158056. - // kPrefetchingProbability = 1; + kPrefetchingProbability = 1; break; case chrome::VersionInfo::CHANNEL_BETA: |