Expose all reusable task manager view code so it can be used by Mac

chrome/browser/ui/views/new_task_manager_view_browsertest.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 <wchar.h>

[Lei Zhang, 2015/09/24 05:33:58]

what's this for?

[afakhry, 2015/09/25 16:39:50]

Not sure how this ended up here! Probably eclipse added it for me when I pressed
Ctrl+Shift+N to add a missing include.
Removed.

 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/ui/task_manager/task_manager_columns.h"
+#include "chrome/browser/ui/task_manager/task_manager_table_model.h"
 #include "chrome/browser/ui/views/new_task_manager_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "ui/views/controls/table/table_view.h"
 
 namespace task_management {
 
 class NewTaskManagerViewTest : public InProcessBrowserTest {
  public:
@@ skipping 22 matching lines @@
     if (!local_state)
       FAIL();
 
     DictionaryPrefUpdate dict_update(local_state,
                                      prefs::kTaskManagerColumnVisibility);
     dict_update->Clear();
   }
 
   void ToggleColumnVisibility(NewTaskManagerView* view, int col_id) {
     DCHECK(view);
-    view->ToggleColumnVisibility(col_id);
+    view->table_model_->ToggleColumnVisibility(col_id);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewTaskManagerViewTest);
 };
 
 // Tests that all defined columns have a corresponding string IDs for keying
 // into the user preferences dictionary.
 IN_PROC_BROWSER_TEST_F(NewTaskManagerViewTest, AllColumnsHaveStringIds) {
   for (size_t i = 0; i < kColumnsSize; ++i)
@@ skipping 39 matching lines @@
   // Sort by the first visible and initially ascending sortable column.
   bool is_sorted = false;
   int sorted_col_id = -1;
   for (size_t i = 0; i < table->visible_columns().size(); ++i) {
     const ui::TableColumn& column = table->visible_columns()[i].column;
     if (column.sortable && column.initial_sort_is_ascending) {
       // Toggle the sort twice for a descending sort.
       table->ToggleSortOrder(static_cast<int>(i));
       table->ToggleSortOrder(static_cast<int>(i));
       is_sorted = true;
-      return;
+      sorted_col_id = column.id;
+      break;
     }
   }
 
   if (is_sorted) {
     EXPECT_TRUE(table->is_sorted());
     EXPECT_FALSE(table->sort_descriptors().front().ascending);
     EXPECT_EQ(table->sort_descriptors().front().column_id, sorted_col_id);
   }
 
   // Close the task manager view and re-open. Expect the inverse of the default
@@ skipping 13 matching lines @@
     EXPECT_EQ(table->sort_descriptors().front().column_id, sorted_col_id);
   }
   for (size_t i = 0; i < kColumnsSize; ++i) {
     EXPECT_EQ(!kColumns[i].default_visibility,
               table->IsColumnVisible(kColumns[i].id));
   }
 }
 
 }  // namespace task_management