Revert 55449 - Fix some problems with TaskManagerBrowserTest.PopulateWebCache...

chrome/browser/task_manager.cc

 // Copyright (c) 2010 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.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/net/url_request_tracking.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/task_manager_resource_providers.h"
-#include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "unicode/coll.h"
 
 #if defined(OS_MACOSX)
@@ skipping 135 matching lines @@
 }
 
 std::wstring TaskManagerModel::GetResourceGoatsTeleported(int index) const {
   DCHECK(index < ResourceCount());
   return UTF16ToWide(base::FormatNumber(GetGoatsTeleported(index)));
 }
 
 std::wstring TaskManagerModel::GetResourceWebCoreImageCacheSize(
     int index) const {
   DCHECK(index < ResourceCount());
-  if (!resources_[index]->HasCacheStats())
+  if (!resources_[index]->ReportsCacheStats())
     return l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT);
   const WebKit::WebCache::ResourceTypeStats stats(
       resources_[index]->GetWebCoreCacheStats());
   return FormatStatsSize(stats.images);
 }
 
 std::wstring TaskManagerModel::GetResourceWebCoreScriptsCacheSize(
     int index) const {
   DCHECK(index < ResourceCount());
-  if (!resources_[index]->HasCacheStats())
+  if (!resources_[index]->ReportsCacheStats())
     return l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT);
   const WebKit::WebCache::ResourceTypeStats stats(
       resources_[index]->GetWebCoreCacheStats());
   return FormatStatsSize(stats.scripts);
 }
 
 std::wstring TaskManagerModel::GetResourceWebCoreCSSCacheSize(
     int index) const {
   DCHECK(index < ResourceCount());
-  if (!resources_[index]->HasCacheStats())
+  if (!resources_[index]->ReportsCacheStats())
     return l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT);
   const WebKit::WebCache::ResourceTypeStats stats(
       resources_[index]->GetWebCoreCacheStats());
   return FormatStatsSize(stats.cssStyleSheets);
 }
 
 std::wstring TaskManagerModel::GetResourceSqliteMemoryUsed(int index) const {
   DCHECK(index < ResourceCount());
   if (!resources_[index]->ReportsSqliteMemoryUsed())
     return l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT);
@@ skipping 118 matching lines @@
       int proc1_id = base::GetProcId(resources_[row1]->GetProcess());
       int proc2_id = base::GetProcId(resources_[row2]->GetProcess());
       return ValueCompare<int>(proc1_id, proc2_id);
     }
 
     case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
     case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:
     case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: {
       WebKit::WebCache::ResourceTypeStats stats1 = { { 0 } };
       WebKit::WebCache::ResourceTypeStats stats2 = { { 0 } };
-      if (resources_[row1]->HasCacheStats())
+      if (resources_[row1]->ReportsCacheStats())
         stats1 = resources_[row1]->GetWebCoreCacheStats();
-      if (resources_[row2]->HasCacheStats())
+      if (resources_[row2]->ReportsCacheStats())
         stats2 = resources_[row2]->GetWebCoreCacheStats();
       if (IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN == col_id)
         return ValueCompare<size_t>(stats1.images.size, stats2.images.size);
       if (IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN == col_id)
         return ValueCompare<size_t>(stats1.scripts.size, stats2.scripts.size);
       DCHECK_EQ(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, col_id);
       return ValueCompare<size_t>(stats1.cssStyleSheets.size,
                                   stats2.cssStyleSheets.size);
     }
 
@@ skipping 326 matching lines @@
 
 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);
     }
   }
-  NotificationService::current()->Notify(
-      NotificationType::TASK_MANAGER_RESOURCE_TYPE_STATS_UPDATED,
-      Source<TaskManagerModel>(this),
-      NotificationService::NoDetails());
 }
 
 void TaskManagerModel::NotifyV8HeapStats(base::ProcessId renderer_id,
                                          size_t v8_memory_allocated,
                                          size_t v8_memory_used) {
   for (ResourceList::iterator it = resources_.begin();
        it != resources_.end(); ++it) {
     if (base::GetProcId((*it)->GetProcess()) == renderer_id) {
       (*it)->NotifyV8HeapStats(v8_memory_allocated, v8_memory_used);
     }
@@ skipping 274 matching lines @@
   MetricsMap::const_iterator iter = metrics_map_.find(handle);
   if (iter == metrics_map_.end())
     return false;
 
   if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
     return false;
 
   memory_usage_map_.insert(std::make_pair(handle, *usage));
   return true;
 }