Fix various TaskManager bugs and add new enhancements

chrome/browser/task_management/sampling/task_group.cc

 // Copyright 2015 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_management/sampling/task_group.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "chrome/browser/task_management/task_manager_observer.h"
@@ skipping 45 matching lines @@
     base::ProcessHandle proc_handle,
     base::ProcessId proc_id,
     const scoped_refptr<base::SequencedTaskRunner>& blocking_pool_runner)
     : process_handle_(proc_handle),
       process_id_(proc_id),
       worker_thread_sampler_(nullptr),
       tasks_(),
       cpu_usage_(0.0),
       memory_usage_(),
       gpu_memory_(-1),
+      per_process_network_usage_(-1),
 #if defined(OS_WIN)
       gdi_current_handles_(-1),
       gdi_peak_handles_(-1),
       user_current_handles_(-1),
       user_peak_handles_(-1),
 #endif  // defined(OS_WIN)
 #if !defined(DISABLE_NACL)
       nacl_debug_stub_port_(-1),
 #endif  // !defined(DISABLE_NACL)
       idle_wakeups_per_second_(-1),
@@ skipping 29 matching lines @@
   tasks_.erase(task->task_id());
 }
 
 void TaskGroup::Refresh(
     const content::GPUVideoMemoryUsageStats& gpu_memory_stats,
     base::TimeDelta update_interval,
     int64 refresh_flags) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // First refresh the enabled non-expensive resources usages on the UI thread.
-  // 1- Refresh all the tasks.
-  for (auto& task_pair : tasks_)
-    task_pair.second->Refresh(update_interval, refresh_flags);
+  // 1- Refresh all the tasks as well as the total network usage (if enabled).
+  const bool network_usage_refresh_enabled =
+      IsResourceRefreshEnabled(REFRESH_TYPE_NETWORK_USAGE, refresh_flags);
+  per_process_network_usage_ = network_usage_refresh_enabled ? 0 : -1;
+  for (auto& task_pair : tasks_) {
+    Task* task = task_pair.second;
+    task->Refresh(update_interval, refresh_flags);
+
+    if (network_usage_refresh_enabled && task->ReportsNetworkUsage()) {
+      per_process_network_usage_ += task->network_usage();
+    }
+  }
 
   // 2- Refresh GPU memory (if enabled).
   if (IsResourceRefreshEnabled(REFRESH_TYPE_GPU_MEMORY, refresh_flags))
     RefreshGpuMemory(gpu_memory_stats);
 
   // 3- Refresh Windows handles (if enabled).
 #if defined(OS_WIN)
   if (IsResourceRefreshEnabled(REFRESH_TYPE_HANDLES, refresh_flags))
     RefreshWindowsHandles();
 #endif  // defined(OS_WIN)
@@ skipping 71 matching lines @@
   memory_usage_ = memory_usage;
 }
 
 void TaskGroup::OnIdleWakeupsRefreshDone(int idle_wakeups_per_second) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   idle_wakeups_per_second_ = idle_wakeups_per_second;
 }
 
 }  // namespace task_management