TaskManager: Remove some unused/unnecessary methods.

What's removed:
 - The idea of unique_id's (these were for the now-gone webUI taskmanager).
 - The GetResourceExtension() method, which the tests no longer need.
 - The IsBackground getter, which is not used.

BUG=348836

Review URL: https://codereview.chromium.org/186153002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255217 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/task_manager/background_resource_provider.cc

@@ -48,7 +48,6 @@ class BackgroundContentsResource : public RendererResource {
   virtual base::string16 GetTitle() const OVERRIDE;
   virtual base::string16 GetProfileName() const OVERRIDE;
   virtual gfx::ImageSkia GetIcon() const OVERRIDE;
-  virtual bool IsBackground() const OVERRIDE;
 
   const base::string16& application_name() const { return application_name_; }
  private:
@@ -115,10 +114,6 @@ gfx::ImageSkia BackgroundContentsResource::GetIcon() const {
   return *default_icon_;
 }
 
-bool BackgroundContentsResource::IsBackground() const {
-  return true;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // BackgroundContentsResourceProvider class
 ////////////////////////////////////////////////////////////////////////////////

chrome/browser/task_manager/extension_process_resource_provider.cc

@@ -53,15 +53,16 @@ class ExtensionProcessResource : public Resource {
   virtual void Inspect() const OVERRIDE;
   virtual bool SupportNetworkUsage() const OVERRIDE;
   virtual void SetSupportNetworkUsage() OVERRIDE;
-  virtual const extensions::Extension* GetExtension() const OVERRIDE;
 
   // Returns the pid of the extension process.
   int process_id() const { return pid_; }
 
+ private:
+  const extensions::Extension* GetExtension() const;
+
   // Returns true if the associated extension has a background page.
-  virtual bool IsBackground() const OVERRIDE;
+  bool IsBackground() const;
 
- private:
   // The icon painted for the extension process.
   static gfx::ImageSkia* default_icon_;
 

chrome/browser/task_manager/guest_resource_provider.cc

@@ -43,7 +43,6 @@ class GuestResource : public RendererResource {
   virtual base::string16 GetProfileName() const OVERRIDE;
   virtual gfx::ImageSkia GetIcon() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual const extensions::Extension* GetExtension() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GuestResource);
@@ -95,10 +94,6 @@ WebContents* GuestResource::GetWebContents() const {
   return WebContents::FromRenderViewHost(render_view_host());
 }
 
-const Extension* GuestResource::GetExtension() const {
-  return NULL;
-}
-
 GuestResourceProvider::GuestResourceProvider(TaskManager* task_manager)
     :  updating_(false),
        task_manager_(task_manager) {

chrome/browser/task_manager/panel_resource_provider.cc

@@ -41,7 +41,6 @@ class PanelResource : public RendererResource {
   virtual base::string16 GetProfileName() const OVERRIDE;
   virtual gfx::ImageSkia GetIcon() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual const extensions::Extension* GetExtension() const OVERRIDE;
 
  private:
   Panel* panel_;
@@ -57,11 +56,12 @@ PanelResource::PanelResource(Panel* panel)
         panel->GetWebContents()->GetRenderProcessHost()->GetHandle(),
         panel->GetWebContents()->GetRenderViewHost()),
       panel_(panel) {
+  ExtensionService* service = panel_->profile()->GetExtensionService();
   message_prefix_id_ = util::GetMessagePrefixID(
-      GetExtension()->is_app(),
+      service->extensions()->GetByID(panel_->extension_id())->is_app(),
       true,  // is_extension
-      panel->profile()->IsOffTheRecord(),
-      false,  // is_prerender
+      panel_->profile()->IsOffTheRecord(),
+      false,   // is_prerender
       false);  // is_background
 }
 
@@ -100,12 +100,6 @@ WebContents* PanelResource::GetWebContents() const {
   return panel_->GetWebContents();
 }
 
-const Extension* PanelResource::GetExtension() const {
-  ExtensionService* extension_service =
-      panel_->profile()->GetExtensionService();
-  return extension_service->extensions()->GetByID(panel_->extension_id());
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // PanelResourceProvider class
 ////////////////////////////////////////////////////////////////////////////////

chrome/browser/task_manager/resource_provider.cc

@@ -44,10 +44,6 @@ size_t Resource::SqliteMemoryUsedBytes() const {
   return 0;
 }
 
-const extensions::Extension* Resource::GetExtension() const {
-  return NULL;
-}
-
 bool Resource::ReportsV8MemoryStats() const {
   return false;
 }
@@ -72,8 +68,4 @@ content::WebContents* Resource::GetWebContents() const {
   return NULL;
 }
 
-bool Resource::IsBackground() const {
-  return false;
-}
-
 }  // namespace task_manager

chrome/browser/task_manager/resource_provider.h

@@ -73,9 +73,6 @@ class Resource {
   virtual bool ReportsSqliteMemoryUsed() const;
   virtual size_t SqliteMemoryUsedBytes() const;
 
-  // Return extension associated with the resource, or NULL if not applicable.
-  virtual const extensions::Extension* GetExtension() const;
-
   virtual bool ReportsV8MemoryStats() const;
   virtual size_t GetV8MemoryAllocated() const;
   virtual size_t GetV8MemoryUsed() const;
@@ -114,10 +111,6 @@ class Resource {
   virtual void NotifyV8HeapStats(size_t v8_memory_allocated,
                                  size_t v8_memory_used) {}
 
-  // Returns true if this resource is not visible to the user because it lives
-  // in the background (e.g. extension background page, background contents).
-  virtual bool IsBackground() const;
-
   static const char* GetResourceTypeAsString(const Type type) {
     switch (type) {
       TASKMANAGER_RESOURCE_TYPE_LIST(TASKMANAGER_RESOURCE_TYPE_LIST_AS_STRING)
@@ -125,17 +118,10 @@ class Resource {
     }
   }
 
-  // Returns resource identifier that is unique within single task manager
-  // session (between StartUpdating and StopUpdating).
-  int get_unique_id() { return unique_id_; }
-
  protected:
-  Resource() : unique_id_(0) {}
+  Resource() {}
 
  private:
-  friend class ::TaskManagerModel;
-  int unique_id_;
-
   DISALLOW_COPY_AND_ASSIGN(Resource);
 };
 

chrome/browser/task_manager/tab_contents_resource_provider.cc

@@ -79,7 +79,6 @@ class TabContentsResource : public RendererResource {
   virtual base::string16 GetProfileName() const OVERRIDE;
   virtual gfx::ImageSkia GetIcon() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual const extensions::Extension* GetExtension() const OVERRIDE;
 
  private:
   // Returns true if contains content rendered by an extension.
@@ -155,16 +154,6 @@ WebContents* TabContentsResource::GetWebContents() const {
   return web_contents_;
 }
 
-const Extension* TabContentsResource::GetExtension() const {
-  if (HostsExtension()) {
-    ExtensionService* extension_service = profile_->GetExtensionService();
-    return extension_service->extensions()->GetByID(
-        web_contents_->GetURL().host());
-  }
-
-  return NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsResourceProvider class
 ////////////////////////////////////////////////////////////////////////////////

chrome/browser/task_manager/task_manager.cc

@@ -243,8 +243,7 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
       update_requests_(0),
       listen_requests_(0),
       update_state_(IDLE),
-      goat_salt_(base::RandUint64()),
-      last_unique_id_(0) {
+      goat_salt_(base::RandUint64()) {
   AddResourceProvider(
       new task_manager::BrowserProcessResourceProvider(task_manager));
   AddResourceProvider(
@@ -318,19 +317,6 @@ base::ProcessHandle TaskManagerModel::GetProcess(int index) const {
   return GetResource(index)->GetProcess();
 }
 
-int TaskManagerModel::GetResourceUniqueId(int index) const {
-  return GetResource(index)->get_unique_id();
-}
-
-int TaskManagerModel::GetResourceIndexByUniqueId(const int unique_id) const {
-  for (int resource_index = 0; resource_index < ResourceCount();
-       ++resource_index) {
-    if (GetResourceUniqueId(resource_index) == unique_id)
-      return resource_index;
-  }
-  return -1;
-}
-
 base::string16 TaskManagerModel::GetResourceById(int index, int col_id) const {
   if (IsSharedByGroup(col_id) && !IsResourceFirstInGroup(index))
     return base::string16();
@@ -766,10 +752,6 @@ bool TaskManagerModel::IsResourceLastInGroup(int index) const {
   return (group->back() == resource);
 }
 
-bool TaskManagerModel::IsBackgroundResource(int index) const {
-  return GetResource(index)->IsBackground();
-}
-
 gfx::ImageSkia TaskManagerModel::GetResourceIcon(int index) const {
   gfx::ImageSkia icon = GetResource(index)->GetIcon();
   if (!icon.isNull())
@@ -978,14 +960,7 @@ WebContents* TaskManagerModel::GetResourceWebContents(int index) const {
   return GetResource(index)->GetWebContents();
 }
 
-const extensions::Extension* TaskManagerModel::GetResourceExtension(
-    int index) const {
-  return GetResource(index)->GetExtension();
-}
-
 void TaskManagerModel::AddResource(Resource* resource) {
-  resource->unique_id_ = ++last_unique_id_;
-
   base::ProcessHandle process = resource->GetProcess();
 
   ResourceList* group_entries = NULL;
@@ -1179,7 +1154,6 @@ void TaskManagerModel::Clear() {
     FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,
                       OnItemsRemoved(0, size));
   }
-  last_unique_id_ = 0;
 }
 
 void TaskManagerModel::ModelChanged() {

chrome/browser/task_manager/task_manager.h

@@ -159,10 +159,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   int GetIdleWakeupsPerSecond(int index) const;
   base::ProcessId GetProcessId(int index) const;
   base::ProcessHandle GetProcess(int index) const;
-  int GetResourceUniqueId(int index) const;
-  // Returns the index of resource that has the given |unique_id|. Returns -1 if
-  // no resouce has the |unique_id|.
-  int GetResourceIndexByUniqueId(const int unique_id) const;
 
   // Catchall method that calls off to the appropriate GetResourceXXX method
   // based on |col_id|. |col_id| is an IDS_ value used to identify the column.
@@ -254,10 +250,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   bool IsResourceFirstInGroup(int index) const;
   bool IsResourceLastInGroup(int index) const;
 
-  // Returns true if the resource runs in the background (not visible to the
-  // user, e.g. extension background pages and BackgroundContents).
-  bool IsBackgroundResource(int index) const;
-
   // Returns icon to be used for resource (for example a favicon).
   gfx::ImageSkia GetResourceIcon(int index) const;
 
@@ -287,9 +279,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   // Returns WebContents of given resource or NULL if not applicable.
   content::WebContents* GetResourceWebContents(int index) const;
 
-  // Returns Extension of given resource or NULL if not applicable.
-  const extensions::Extension* GetResourceExtension(int index) const;
-
   void AddResource(task_manager::Resource* resource);
   void RemoveResource(task_manager::Resource* resource);
 
@@ -566,9 +555,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   // A salt lick for the goats.
   uint64 goat_salt_;
 
-  // Resource identifier that is unique within single session.
-  int last_unique_id_;
-
   // Buffer for coalescing BytesReadParam so we don't have to post a task on
   // each NotifyBytesRead() call.
   std::vector<BytesReadParam> bytes_read_buffer_;