Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(790)

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 2181493002: Return unique_ptrs from base::ProcessMetrics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove os_resource_win.* Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <functional> 10 #include <functional>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/process/process_metrics.h"
14 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
15 #include "build/build_config.h" 16 #include "build/build_config.h"
16 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/history/history_tab_helper.h" 18 #include "chrome/browser/history/history_tab_helper.h"
18 #include "chrome/browser/prerender/prerender_field_trial.h" 19 #include "chrome/browser/prerender/prerender_field_trial.h"
19 #include "chrome/browser/prerender/prerender_final_status.h" 20 #include "chrome/browser/prerender/prerender_final_status.h"
20 #include "chrome/browser/prerender/prerender_handle.h" 21 #include "chrome/browser/prerender/prerender_handle.h"
21 #include "chrome/browser/prerender/prerender_manager.h" 22 #include "chrome/browser/prerender/prerender_manager.h"
22 #include "chrome/browser/prerender/prerender_manager_factory.h" 23 #include "chrome/browser/prerender/prerender_manager_factory.h"
23 #include "chrome/browser/prerender/prerender_resource_throttle.h" 24 #include "chrome/browser/prerender/prerender_resource_throttle.h"
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 prerender_manager_->AddToHistory(this); 603 prerender_manager_->AddToHistory(this);
603 prerender_manager_->MoveEntryToPendingDelete(this, final_status); 604 prerender_manager_->MoveEntryToPendingDelete(this, final_status);
604 605
605 if (!prerender_manager_->IsControlGroup() && prerendering_has_started()) 606 if (!prerender_manager_->IsControlGroup() && prerendering_has_started())
606 NotifyPrerenderStop(); 607 NotifyPrerenderStop();
607 } 608 }
608 609
609 base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() { 610 base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {
610 if (!process_metrics_) { 611 if (!process_metrics_) {
611 // If a PrenderContents hasn't started prerending, don't be fully formed. 612 // If a PrenderContents hasn't started prerending, don't be fully formed.
612 if (!GetRenderViewHost() || !GetRenderViewHost()->GetProcess()) 613 const RenderViewHost* rvh = GetRenderViewHost();
613 return NULL; 614 if (!rvh)
614 base::ProcessHandle handle = GetRenderViewHost()->GetProcess()->GetHandle(); 615 return nullptr;
616
617 const content::RenderProcessHost* rph = rvh->GetProcess();
618 if (!rph)
619 return nullptr;
620
621 base::ProcessHandle handle = rph->GetHandle();
615 if (handle == base::kNullProcessHandle) 622 if (handle == base::kNullProcessHandle)
616 return NULL; 623 return nullptr;
624
617 #if !defined(OS_MACOSX) 625 #if !defined(OS_MACOSX)
618 process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle)); 626 process_metrics_ = base::ProcessMetrics::CreateProcessMetrics(handle);
619 #else 627 #else
620 process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics( 628 process_metrics_ = base::ProcessMetrics::CreateProcessMetrics(
621 handle, 629 handle, content::BrowserChildProcessHost::GetPortProvider());
622 content::BrowserChildProcessHost::GetPortProvider()));
623 #endif 630 #endif
624 } 631 }
625 632
626 return process_metrics_.get(); 633 return process_metrics_.get();
627 } 634 }
628 635
629 void PrerenderContents::DestroyWhenUsingTooManyResources() { 636 void PrerenderContents::DestroyWhenUsingTooManyResources() {
630 base::ProcessMetrics* metrics = MaybeGetProcessMetrics(); 637 base::ProcessMetrics* metrics = MaybeGetProcessMetrics();
631 if (!metrics) 638 if (!metrics)
632 return; 639 return;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 void PrerenderContents::AddResourceThrottle( 719 void PrerenderContents::AddResourceThrottle(
713 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { 720 const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
714 resource_throttles_.push_back(throttle); 721 resource_throttles_.push_back(throttle);
715 } 722 }
716 723
717 void PrerenderContents::AddNetworkBytes(int64_t bytes) { 724 void PrerenderContents::AddNetworkBytes(int64_t bytes) {
718 network_bytes_ += bytes; 725 network_bytes_ += bytes;
719 } 726 }
720 727
721 } // namespace prerender 728 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698