Switch BackgroundContents to use TabContents instead of RenderViewHost.

chrome/browser/task_manager/task_manager_resource_providers.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/task_manager_resource_providers.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
@@ skipping 478 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerBackgroundContentsResource class
 ////////////////////////////////////////////////////////////////////////////////
 
 SkBitmap* TaskManagerBackgroundContentsResource::default_icon_ = NULL;
 
 TaskManagerBackgroundContentsResource::TaskManagerBackgroundContentsResource(
     BackgroundContents* background_contents,
     const string16& application_name)
     : TaskManagerRendererResource(
-          background_contents->render_view_host()->process()->GetHandle(),
-          background_contents->render_view_host()),
+          background_contents->tab_contents()->GetRenderProcessHost()->
+              GetHandle(),
+          background_contents->tab_contents()->render_view_host()),
       background_contents_(background_contents),
       application_name_(application_name) {
   // Just use the same icon that other extension resources do.
   // TODO(atwilson): Use the favicon when that's available.
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
   }
   // Ensure that the string has the appropriate direction markers (see comment
   // in TaskManagerTabContentsResource::GetTitle()).
@@ skipping 40 matching lines @@
 
 TaskManagerBackgroundContentsResourceProvider::
     ~TaskManagerBackgroundContentsResourceProvider() {
 }
 
 TaskManager::Resource*
 TaskManagerBackgroundContentsResourceProvider::GetResource(
     int origin_pid,
     int render_process_host_id,
     int routing_id) {
-  BackgroundContents* contents = BackgroundContents::GetBackgroundContentsByID(
-      render_process_host_id, routing_id);
-  if (!contents)  // This resource no longer exists.
-    return NULL;
-
   // If an origin PID was specified, the request is from a plugin, not the
   // render view host process
   if (origin_pid)
     return NULL;
 
-  std::map<BackgroundContents*,
-      TaskManagerBackgroundContentsResource*>::iterator res_iter =
-      resources_.find(contents);
-  if (res_iter == resources_.end())
-    // Can happen if the page went away while a network request was being
-    // performed.
-    return NULL;
+  for (Resources::iterator i = resources_.begin(); i != resources_.end(); i++) {
+    TabContents* tab = i->first->tab_contents();
+    if (tab->render_view_host()->process()->id() == render_process_host_id &&
+        tab->render_view_host()->routing_id() == routing_id) {
+      return i->second;
+    }
+  }
 
-  return res_iter->second;
+  // Can happen if the page went away while a network request was being
+  // performed.
+  return NULL;
 }
 
 void TaskManagerBackgroundContentsResourceProvider::StartUpdating() {
   DCHECK(!updating_);
   updating_ = true;
 
   // Add all the existing BackgroundContents from every profile, including
   // incognito profiles.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   std::vector<Profile*> profiles(profile_manager->GetLoadedProfiles());
@@ skipping 64 matching lines @@
   resources_[background_contents] = resource;
   task_manager_->AddResource(resource);
 }
 
 void TaskManagerBackgroundContentsResourceProvider::Add(
     BackgroundContents* contents, const string16& application_name) {
   if (!updating_)
     return;
 
   // Don't add contents whose process is dead.
-  if (!contents->render_view_host()->process()->GetHandle())
+  if (!contents->tab_contents()->GetRenderProcessHost()->GetHandle())
     return;
 
   // Should never add the same BackgroundContents twice.
   DCHECK(resources_.find(contents) == resources_.end());
   AddToTaskManager(contents, application_name);
 }
 
 void TaskManagerBackgroundContentsResourceProvider::Remove(
     BackgroundContents* contents) {
   if (!updating_)
     return;
-  std::map<BackgroundContents*,
-      TaskManagerBackgroundContentsResource*>::iterator iter =
-      resources_.find(contents);
+  Resources::iterator iter = resources_.find(contents);
   DCHECK(iter != resources_.end());
 
   // Remove the resource from the Task Manager.
   TaskManagerBackgroundContentsResource* resource = iter->second;
   task_manager_->RemoveResource(resource);
   // And from the provider.
   resources_.erase(iter);
   // Finally, delete the resource.
   delete resource;
 }
@@ skipping 704 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }