diff options
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 25 |
2 files changed, 3 insertions, 24 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index d66b98d..d41c9c3 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -580,8 +580,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kEnableClickToPlay, switches::kEnableResourceContentSettings, switches::kPrelaunchGpuProcess, - switches::kEnableContentPrefetch, - switches::kDisableContentPrefetch, switches::kEnableAcceleratedCompositing, switches::kEnableAcceleratedDecoding, }; diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index d3b8b8b..34a0cdb 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -4815,17 +4815,8 @@ void RenderView::DumpLoadHistograms() const { static const bool prefetching_fieldtrial = FieldTrialList::Find("Prefetch") && !FieldTrialList::Find("Prefetch")->group_name().empty(); - static const bool prefetching_explicitly_disabled = - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableContentPrefetch); - if (navigation_state->was_prefetcher()) { - if (!prefetching_explicitly_disabled) { - PLT_HISTOGRAM("PLT.BeginToFinishDoc_ContentPrefetcher", - begin_to_finish_doc); - PLT_HISTOGRAM("PLT.BeginToFinish_ContentPrefetcher", - begin_to_finish_all_loads); - } - if (prefetching_fieldtrial) { + if (prefetching_fieldtrial) { + if (navigation_state->was_prefetcher()) { PLT_HISTOGRAM( FieldTrial::MakeName("PLT.BeginToFinishDoc_ContentPrefetcher", "Prefetch"), @@ -4835,15 +4826,7 @@ void RenderView::DumpLoadHistograms() const { "Prefetch"), begin_to_finish_all_loads); } - } - if (navigation_state->was_referred_by_prefetcher()) { - if (!prefetching_explicitly_disabled) { - PLT_HISTOGRAM("PLT.BeginToFinishDoc_ContentPrefetcherReferrer", - begin_to_finish_doc); - PLT_HISTOGRAM("PLT.BeginToFinish_ContentPrefetcherReferrer", - begin_to_finish_all_loads); - } - if (prefetching_fieldtrial) { + if (navigation_state->was_referred_by_prefetcher()) { PLT_HISTOGRAM( FieldTrial::MakeName("PLT.BeginToFinishDoc_ContentPrefetcherReferrer", "Prefetch"), @@ -4853,8 +4836,6 @@ void RenderView::DumpLoadHistograms() const { "Prefetch"), begin_to_finish_all_loads); } - } - if (prefetching_fieldtrial) { UMA_HISTOGRAM_ENUMERATION(FieldTrial::MakeName("PLT.Abandoned", "Prefetch"), abandoned_page ? 1 : 0, 2); PLT_HISTOGRAM(FieldTrial::MakeName("PLT.BeginToFinishDoc", "Prefetch"), |