Task Manager: Remove goat teleporter.

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

Cr-Commit-Position: refs/heads/master@{#293866}

5 files changed, 1 insertions, 49 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index eb8275e..2357abe 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3557,9 +3557,6 @@ Make sure you do not expose any sensitive information.
           <message name="IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN" desc="Task manager idle processor wakeups column">
             Idle wake ups
           </message>
-          <message name="IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN" desc="The goats teleported column">
-            Goats teleported
-          </message>
           <message name="IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN" desc="Task manager WebCore image cache size column.">
             Image cache
           </message>
@@ -3619,9 +3616,6 @@ Make sure you do not expose any sensitive information.
           <message name="IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN" desc="Task manager idle processor wakeups column">
             Idle Wake Ups
           </message>
-          <message name="IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN" desc="The goats teleported column">
-            Goats Teleported
-          </message>
           <message name="IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN" desc="Task manager WebCore image cache size column.">
             Image Cache
           </message>
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 9919563..9c91dc0 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -9,7 +9,6 @@
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/process/process_metrics.h"
-#include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ -197,8 +196,6 @@ TaskManagerModel::PerResourceValues::PerResourceValues()
       network_usage(0),
       is_process_id_valid(false),
       process_id(0),
-      is_goats_teleported_valid(false),
-      goats_teleported(0),
       is_webcore_stats_valid(false),
       is_sqlite_memory_bytes_valid(false),
       sqlite_memory_bytes(0),
@@ -241,8 +238,7 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
       update_requests_(0),
       listen_requests_(0),
       update_state_(IDLE),
-      is_updating_byte_count_(false),
-      goat_salt_(base::RandUint64()) {
+      is_updating_byte_count_(false) {
   AddResourceProvider(
       new task_manager::BrowserProcessResourceProvider(task_manager));
   AddResourceProvider(new task_manager::WebContentsResourceProvider(
@@ -363,9 +359,6 @@ base::string16 TaskManagerModel::GetResourceById(int index, int col_id) const {
     case IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN:
       return GetResourceIdleWakeupsPerSecond(index);
 
-    case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:
-      return GetResourceGoatsTeleported(index);
-
     case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
       return GetResourceWebCoreImageCacheSize(index);
 
@@ -529,11 +522,6 @@ base::string16 TaskManagerModel::GetResourceIdleWakeupsPerSecond(int index)
   return base::FormatNumber(GetIdleWakeupsPerSecond(GetResource(index)));
 }
 
-base::string16 TaskManagerModel::GetResourceGoatsTeleported(int index) const {
-  CHECK_LT(index, ResourceCount());
-  return base::FormatNumber(GetGoatsTeleported(index));
-}
-
 base::string16 TaskManagerModel::GetResourceV8MemoryAllocatedSize(
     int index) const {
   size_t memory_allocated = 0, memory_used = 0;
@@ -703,16 +691,6 @@ bool TaskManagerModel::CanActivate(int index) const {
   return GetResourceWebContents(index) != NULL;
 }
 
-int TaskManagerModel::GetGoatsTeleported(int index) const {
-  PerResourceValues& values(GetPerResourceValues(index));
-  if (!values.is_goats_teleported_valid) {
-    values.is_goats_teleported_valid = true;
-    values.goats_teleported = goat_salt_ * (index + 1);
-    values.goats_teleported = (values.goats_teleported >> 16) & 255;
-  }
-  return values.goats_teleported;
-}
-
 bool TaskManagerModel::IsResourceFirstInGroup(int index) const {
   Resource* resource = GetResource(index);
   GroupMap::const_iterator iter = group_map_.find(resource->GetProcess());
@@ -907,9 +885,6 @@ int TaskManagerModel::CompareValues(int row1, int row2, int col_id) const {
           OrderUnavailableValue(value1_valid, value2_valid);
     }
 
-    case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:
-      return ValueCompare(GetGoatsTeleported(row1), GetGoatsTeleported(row2));
-
     case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
       return ValueCompareMember(
           this, &TaskManagerModel::GetV8Memory, row1, row2);
@@ -1145,8 +1120,6 @@ void TaskManagerModel::ModelChanged() {
 }
 
 void TaskManagerModel::Refresh() {
-  goat_salt_ = base::RandUint64();
-
   per_resource_cache_.clear();
   per_process_cache_.clear();
 
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index 76ce114..082b9c9 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -182,7 +182,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   base::string16 GetResourceVideoMemory(int index) const;
   base::string16 GetResourceSqliteMemoryUsed(int index) const;
   base::string16 GetResourceIdleWakeupsPerSecond(int index) const;
-  base::string16 GetResourceGoatsTeleported(int index) const;
   base::string16 GetResourceV8MemoryAllocatedSize(int index) const;
 
   // Gets the private memory (in bytes) that should be displayed for the passed
@@ -230,9 +229,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   // Returns true if resource for the given row can be activated.
   bool CanActivate(int index) const;
 
-  // See design doc at http://go/at-teleporter for more information.
-  int GetGoatsTeleported(int index) const;
-
   // Returns true if the resource is first/last in its group (resources
   // rendered by the same process are groupped together).
   bool IsResourceFirstInGroup(int index) const;
@@ -347,9 +343,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
     bool is_process_id_valid;
     base::ProcessId process_id;
 
-    bool is_goats_teleported_valid;
-    int goats_teleported;
-
     bool is_webcore_stats_valid;
     blink::WebCache::ResourceTypeStats webcore_stats;
 
@@ -540,9 +533,6 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   // only on the IO thread.
   bool is_updating_byte_count_;
 
-  // A salt lick for the goats.
-  uint64 goat_salt_;
-
   // Buffer for coalescing BytesReadParam so we don't have to post a task on
   // each NotifyBytesRead() call.
   std::vector<BytesReadParam> bytes_read_buffer_;
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm
index 959085b..6b83f84 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -64,8 +64,6 @@ const struct ColumnWidth {
       arraysize("32767") * kCharWidth, -1 },
   { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN,
       arraysize("idlewakeups") * kCharWidth, -1 },
-  { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN,
-      arraysize("15 ") * kCharWidth, -1 },
 };
 
 class SortHelper {
@@ -309,7 +307,6 @@ class SortHelper {
                 visible:NO];
   [self addColumnWithId:IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN
                 visible:NO];
-  [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO];
 }
 
 // Creates a context menu for the table header that allows the user to toggle
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index f007095..3983d5e 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -354,8 +354,6 @@ void TaskManagerView::Init() {
                                   false);
   tab_table_->SetColumnVisibility(
       IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, false);
-  tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN,
-                                  false);
   tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, false);
   tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_USER_HANDLES_COLUMN, false);