summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.cc
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-03-05 16:55:04 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-06 00:55:42 +0000
commit879199cfc3fd23829d6bf4d0f7a0202ee3805bbd (patch)
treea2ce90036c478d7f4e7c7c4585ab5b9c6cd0bc8e /chrome/browser/browser_process_impl.cc
parent20e3f0f204923504335bc0508154f853e4b81c16 (diff)
downloadchromium_src-879199cfc3fd23829d6bf4d0f7a0202ee3805bbd.zip
chromium_src-879199cfc3fd23829d6bf4d0f7a0202ee3805bbd.tar.gz
chromium_src-879199cfc3fd23829d6bf4d0f7a0202ee3805bbd.tar.bz2
Remove prerender cookie store, part 1.
This partially reverts https://codereview.chromium.org/280403002 and https://codereview.chromium.org/293123010. It leaves the MayReuseHost hook intact as that is still useful for prerender's memory checking logic. Follow-up bugs will revert the machinery added to support this mechanism, notably all the logic to use custom CookieStores and some of the no longer necessary histograms. This removes PrerenderTracker which is now unused. BUG=457344 Review URL: https://codereview.chromium.org/913893002 Cr-Commit-Position: refs/heads/master@{#319380}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
-rw-r--r--chrome/browser/browser_process_impl.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 31a2dbc..0f7eecd 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -51,7 +51,6 @@
#include "chrome/browser/plugins/plugin_finder.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/chrome_pref_service_factory.h"
-#include "chrome/browser/prerender/prerender_tracker.h"
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/printing/print_preview_dialog_controller.h"
@@ -867,13 +866,6 @@ ChromeNetLog* BrowserProcessImpl::net_log() {
return net_log_.get();
}
-prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() {
- if (!prerender_tracker_.get())
- prerender_tracker_.reset(new prerender::PrerenderTracker);
-
- return prerender_tracker_.get();
-}
-
component_updater::ComponentUpdateService*
BrowserProcessImpl::component_updater() {
if (!component_updater_.get()) {
@@ -923,7 +915,7 @@ BrowserProcessImpl::supervised_user_whitelist_installer() {
void BrowserProcessImpl::ResourceDispatcherHostCreated() {
resource_dispatcher_host_delegate_.reset(
- new ChromeResourceDispatcherHostDelegate(prerender_tracker()));
+ new ChromeResourceDispatcherHostDelegate);
ResourceDispatcherHost::Get()->SetDelegate(
resource_dispatcher_host_delegate_.get());