Fix and re-enable PrerenderTaskManager test

chrome/browser/task_manager/task_manager.cc

 // Copyright (c) 2012 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.h"
 
 #include "base/bind.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 1145 matching lines @@
                       OnItemsRemoved(0, size));
   }
   last_unique_id_ = 0;
 }
 
 void TaskManagerModel::ModelChanged() {
   // Notify the table that the contents have changed for it to redraw.
   FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_, OnModelChanged());
 }
 
+void TaskManagerModel::Refresh() {
+  goat_salt_ = base::RandUint64();
+
+  per_resource_cache_.clear();
+  per_process_cache_.clear();
+
+  // Compute the CPU usage values.
+  // Note that we compute the CPU usage for all resources (instead of doing it
+  // lazily) as process_util::GetCPUUsage() returns the CPU usage since the last
+  // time it was called, and not calling it everytime would skew the value the
+  // next time it is retrieved (as it would be for more than 1 cycle).
+  for (ResourceList::iterator iter = resources_.begin();
+       iter != resources_.end(); ++iter) {
+    base::ProcessHandle process = (*iter)->GetProcess();
+    PerProcessValues& values(per_process_cache_[process]);
+    if (values.is_cpu_usage_valid)
+      continue;
+
+    values.is_cpu_usage_valid = true;
+    MetricsMap::iterator metrics_iter = metrics_map_.find(process);
+    DCHECK(metrics_iter != metrics_map_.end());
+    values.cpu_usage = metrics_iter->second->GetCPUUsage();
+  }
+
+  // Send a request to refresh GPU memory consumption values
+  RefreshVideoMemoryUsageStats();
+
+  // Compute the new network usage values.
+  base::TimeDelta update_time =
+      base::TimeDelta::FromMilliseconds(kUpdateTimeMs);
+  for (ResourceValueMap::iterator iter = current_byte_count_map_.begin();
+       iter != current_byte_count_map_.end(); ++iter) {
+    PerResourceValues* values = &(per_resource_cache_[iter->first]);
+    if (update_time > base::TimeDelta::FromSeconds(1))
+      values->network_usage = iter->second / update_time.InSeconds();
+    else
+      values->network_usage = iter->second * (1 / update_time.InSeconds());
+
+    // Then we reset the current byte count.
+    iter->second = 0;
+  }
+
+  // Let resources update themselves if they need to.
+  for (ResourceList::iterator iter = resources_.begin();
+       iter != resources_.end(); ++iter) {
+     (*iter)->Refresh();
+  }
+
+  if (!resources_.empty()) {
+    FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,
+                      OnItemsChanged(0, ResourceCount()));
+  }
+}
+
 void TaskManagerModel::NotifyResourceTypeStats(
     base::ProcessId renderer_id,
     const WebKit::WebCache::ResourceTypeStats& stats) {
   for (ResourceList::iterator it = resources_.begin();
        it != resources_.end(); ++it) {
     if (base::GetProcId((*it)->GetProcess()) == renderer_id) {
       (*it)->NotifyResourceTypeStats(stats);
     }
   }
 }
@@ skipping 93 matching lines @@
 
   Refresh();
 
   // Schedule the next update.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&TaskManagerModel::RefreshCallback, this),
       base::TimeDelta::FromMilliseconds(kUpdateTimeMs));
 }
 
-void TaskManagerModel::Refresh() {
-  goat_salt_ = base::RandUint64();
-
-  per_resource_cache_.clear();
-  per_process_cache_.clear();
-
-  // Compute the CPU usage values.
-  // Note that we compute the CPU usage for all resources (instead of doing it
-  // lazily) as process_util::GetCPUUsage() returns the CPU usage since the last
-  // time it was called, and not calling it everytime would skew the value the
-  // next time it is retrieved (as it would be for more than 1 cycle).
-  for (ResourceList::iterator iter = resources_.begin();
-       iter != resources_.end(); ++iter) {
-    base::ProcessHandle process = (*iter)->GetProcess();
-    PerProcessValues& values(per_process_cache_[process]);
-    if (values.is_cpu_usage_valid)
-      continue;
-
-    values.is_cpu_usage_valid = true;
-    MetricsMap::iterator metrics_iter = metrics_map_.find(process);
-    DCHECK(metrics_iter != metrics_map_.end());
-    values.cpu_usage = metrics_iter->second->GetCPUUsage();
-  }
-
-  // Send a request to refresh GPU memory consumption values
-  RefreshVideoMemoryUsageStats();
-
-  // Compute the new network usage values.
-  base::TimeDelta update_time =
-      base::TimeDelta::FromMilliseconds(kUpdateTimeMs);
-  for (ResourceValueMap::iterator iter = current_byte_count_map_.begin();
-       iter != current_byte_count_map_.end(); ++iter) {
-    PerResourceValues* values = &(per_resource_cache_[iter->first]);
-    if (update_time > base::TimeDelta::FromSeconds(1))
-      values->network_usage = iter->second / update_time.InSeconds();
-    else
-      values->network_usage = iter->second * (1 / update_time.InSeconds());
-
-    // Then we reset the current byte count.
-    iter->second = 0;
-  }
-
-  // Let resources update themselves if they need to.
-  for (ResourceList::iterator iter = resources_.begin();
-       iter != resources_.end(); ++iter) {
-     (*iter)->Refresh();
-  }
-
-  if (!resources_.empty()) {
-    FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,
-                      OnItemsChanged(0, ResourceCount()));
-  }
-}
-
 void TaskManagerModel::RefreshVideoMemoryUsageStats() {
   if (pending_video_memory_usage_stats_update_)
     return;
 
   if (!video_memory_usage_stats_observer_.get()) {
     video_memory_usage_stats_observer_.reset(
         new TaskManagerModelGpuDataManagerObserver());
   }
   pending_video_memory_usage_stats_update_ = true;
   content::GpuDataManager::GetInstance()->RequestVideoMemoryUsageStatsUpdate();
@@ skipping 215 matching lines @@
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
 }
 
 TaskManager::TaskManager()
     : model_(new TaskManagerModel(this)) {
 }
 
 TaskManager::~TaskManager() {
 }