Expands the chrome.experimental.processes extension API.

Adds an onUpdated event that reports process metrics from the TaskManager,
and modifies the TaskManager to support multiple independent observers.

BUG=32302
TEST=ExtensionApiTest.Processes browsertest
TEST=process_monitor sample extension

Review URL: http://codereview.chromium.org/3597016

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

1 files changed, 34 insertions, 6 deletions

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 0793a4d..419df19 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -70,7 +70,8 @@ string16 FormatStatsSize(const WebKit::WebCache::ResourceTypeStat& stat) {
 ////////////////////////////////////////////////////////////////////////////////
 
 TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
-    : update_state_(IDLE),
+    : update_requests_(0),
+      update_state_(IDLE),
       goat_salt_(rand()) {
 
   TaskManagerBrowserProcessResourceProvider* browser_provider =
@@ -119,9 +120,13 @@ string16 TaskManagerModel::GetResourceTitle(int index) const {
   return WideToUTF16Hack(resources_[index]->GetTitle());
 }
 
-string16 TaskManagerModel::GetResourceNetworkUsage(int index) const {
+int64 TaskManagerModel::GetNetworkUsage(int index) const {
   DCHECK(index < ResourceCount());
-  int64 net_usage = GetNetworkUsage(resources_[index]);
+  return GetNetworkUsage(resources_[index]);
+}
+
+string16 TaskManagerModel::GetResourceNetworkUsage(int index) const {
+  int64 net_usage = GetNetworkUsage(index);
   if (net_usage == -1)
     return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT);
   if (net_usage == 0)
@@ -132,6 +137,11 @@ string16 TaskManagerModel::GetResourceNetworkUsage(int index) const {
   return base::i18n::GetDisplayStringInLTRDirectionality(net_byte);
 }
 
+double TaskManagerModel::GetCPUUsage(int index) const {
+  DCHECK(index < ResourceCount());
+  return GetCPUUsage(resources_[index]);
+}
+
 string16 TaskManagerModel::GetResourceCPUUsage(int index) const {
   DCHECK(index < ResourceCount());
   return WideToUTF16Hack(StringPrintf(
@@ -165,9 +175,13 @@ string16 TaskManagerModel::GetResourcePhysicalMemory(int index) const {
   return GetMemCellText(phys_mem);
 }
 
-string16 TaskManagerModel::GetResourceProcessId(int index) const {
+int TaskManagerModel::GetProcessId(int index) const {
   DCHECK(index < ResourceCount());
-  return base::IntToString16(base::GetProcId(resources_[index]->GetProcess()));
+  return base::GetProcId(resources_[index]->GetProcess());
+}
+
+string16 TaskManagerModel::GetResourceProcessId(int index) const {
+  return base::IntToString16(GetProcessId(index));
 }
 
 string16 TaskManagerModel::GetResourceGoatsTeleported(int index) const {
@@ -482,6 +496,12 @@ string16 TaskManagerModel::GetMemCellText(int64 number) const {
 }
 
 void TaskManagerModel::StartUpdating() {
+  // Multiple StartUpdating requests may come in, and we only need to take
+  // action the first time.
+  update_requests_++;
+  if (update_requests_ > 1)
+    return;
+  DCHECK_EQ(1, update_requests_);
   DCHECK_NE(TASK_PENDING, update_state_);
 
   // If update_state_ is STOPPING, it means a task is still pending.  Setting
@@ -508,6 +528,12 @@ void TaskManagerModel::StartUpdating() {
 }
 
 void TaskManagerModel::StopUpdating() {
+  // Don't actually stop updating until we have heard as many calls as those
+  // to StartUpdating.
+  update_requests_--;
+  if (update_requests_ > 0)
+    return;
+  DCHECK_EQ(0, update_requests_);
   DCHECK_EQ(TASK_PENDING, update_state_);
   update_state_ = STOPPING;
 
@@ -522,6 +548,9 @@ void TaskManagerModel::StopUpdating() {
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &TaskManagerModel::UnregisterForJobDoneNotifications));
+
+  // Must clear the resources before the next attempt to start updating.
+  Clear();
 }
 
 void TaskManagerModel::AddResourceProvider(
@@ -925,7 +954,6 @@ void TaskManager::RemoveResource(Resource* resource) {
 
 void TaskManager::OnWindowClosed() {
   model_->StopUpdating();
-  model_->Clear();
 }
 
 // static