summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 16:38:25 +0000
committerdominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 16:38:25 +0000
commit331ff823b6edc2f8c2b1c32cdb1a67828fbf04d9 (patch)
treef4bc635f768826736f15cf0c142850ff86ed6174
parent4e6ab668a9af49dfcc9aa92909ef51d11edffd57 (diff)
downloadchromium_src-331ff823b6edc2f8c2b1c32cdb1a67828fbf04d9.zip
chromium_src-331ff823b6edc2f8c2b1c32cdb1a67828fbf04d9.tar.gz
chromium_src-331ff823b6edc2f8c2b1c32cdb1a67828fbf04d9.tar.bz2
Handling case where we fail to get a RenderViewHost.
BUG=79391 TEST=none Review URL: http://codereview.chromium.org/6850019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81754 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/task_manager/task_manager_resource_providers.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 1932a58..ed47f1c 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -423,7 +423,13 @@ string16 TaskManagerPrerenderResource::GetTitle() const {
RenderViewHost* render_view_host =
RenderViewHost::FromID(process_route_id_pair_.first,
process_route_id_pair_.second);
- CHECK(render_view_host);
+
+ // In some instances, for instance when the RenderProcessHost has been
+ // destroyed, we try to get the title for a RenderViewHost that has
+ // been removed. Return an empty string in this case.
+ if (!render_view_host)
+ return EmptyString16();
+
RenderViewHostDelegate* delegate = render_view_host->delegate();
string16 title = UTF8ToUTF16(delegate->GetURL().spec());