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

Unified Diff: content/browser/utility_process_host_impl.cc

Issue 972083002: Report utility process JS memory in task manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-oop
Patch Set: Rebase and fix build. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/utility_process_host_impl.cc
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index f6b43bec6aadfa9eb37838196a9c5808b8a6492e..42fe5b97e170d7ed5d026d4fd1b1d655d0d03aa2 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -188,8 +188,9 @@ bool UtilityProcessHostImpl::StartMojoMode() {
}
ServiceRegistry* UtilityProcessHostImpl::GetServiceRegistry() {
- DCHECK(mojo_application_host_);
- return mojo_application_host_->service_registry();
+ if (mojo_application_host_)
+ return mojo_application_host_->service_registry();
+ return nullptr;
}
void UtilityProcessHostImpl::SetName(const base::string16& name) {

Powered by Google App Engine
This is Rietveld 408576698