Revert 54206 - Mac: Keep groups when sorting task manager, like windows does....

chrome/browser/cocoa/task_manager_mac.mm

Index: chrome/browser/cocoa/task_manager_mac.mm
===================================================================
--- chrome/browser/cocoa/task_manager_mac.mm	(revision 54210)
+++ chrome/browser/cocoa/task_manager_mac.mm	(working copy)
@@ -60,19 +60,10 @@
         model_(model) {}
 
   bool operator()(int a, int b) {
-    std::pair<int, int> group_range1 = model_->GetGroupRangeForResource(a);
-    std::pair<int, int> group_range2 = model_->GetGroupRangeForResource(b);
-    if (group_range1 == group_range2) {
-      // The two rows are in the same group, sort so that items in the same
-      // group always appear in the same order. |ascending_| is intentionally
-      // ignored.
-      return a < b;
-    }
-    // Sort by the first entry of each of the groups.
-    int cmp_result = model_->CompareValues(
-        group_range1.first, group_range2.first, sort_column_);
+    int cmp_result = model_->CompareValues(a, b, sort_column_ );
     if (!ascending_)
       cmp_result = -cmp_result;
+    // TODO(thakis): Do grouping like on GTK.
     return cmp_result < 0;
   }
  private:
@@ -419,8 +410,7 @@
     NSString* title = [self modelTextForRow:rowIndex
                                     column:[[tableColumn identifier] intValue]];
     [buttonCell setTitle:title];
-    [buttonCell setImage:
-        taskManagerObserver_->GetImageForRow(indexShuffle_[rowIndex])];
+    [buttonCell setImage:taskManagerObserver_->GetImageForRow(rowIndex)];
     [buttonCell setRefusesFirstResponder:YES];  // Don't push in like a button.
     [buttonCell setHighlightsBy:NSNoCellMask];
   }