Remove the old task manager view

chrome/browser/task_management/task_manager_tester.cc

Index: chrome/browser/task_management/task_manager_tester.cc
diff --git a/chrome/browser/task_management/task_manager_tester.cc b/chrome/browser/task_management/task_manager_tester.cc
index 5ce535296ec57b97396facf588dad5d06de10be1..1bd97b73347efc149130d73a167ba0d1d7a2ab6f 100644
--- a/chrome/browser/task_management/task_manager_tester.cc
+++ b/chrome/browser/task_management/task_manager_tester.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/task_management/task_manager_interface.h"
-#include "chrome/browser/task_manager/legacy_task_manager_tester.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/task_manager/task_manager_table_model.h"
 #include "chrome/common/chrome_switches.h"
@@ -17,6 +16,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/table_model_observer.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/task_manager/legacy_task_manager_tester.h"
+#endif  // defined(OS_MACOSX)
+
 namespace task_management {
 
 namespace {
@@ -25,10 +28,9 @@ namespace {
 // command line, show a view backed by a task_management::TaskManagerTableModel.
 bool IsNewTaskManagerViewEnabled() {

[ncarter (slow), 2016/05/19 22:25:07]

I would just inline this function. It's only called in two spots, one of which
is already #ifdef'd, and the other of which is a CHECK that may not even be
necessary.

[afakhry, 2016/05/20 02:32:50]

Done.

 #if defined(OS_MACOSX)
-  if (!chrome::ToolkitViewsDialogsEnabled())
-    return false;
+  return TaskManagerInterface::IsNewTaskManagerEnabled();
 #endif
-  return switches::NewTaskManagerEnabled();
+  return true;
 }
 
 // Temporarily intercepts the calls between a TableModel and its Observer,
@@ -171,10 +173,12 @@ class TaskManagerTesterImpl : public TaskManagerTester {
 // static
 std::unique_ptr<TaskManagerTester> TaskManagerTester::Create(
     const base::Closure& callback) {
-  if (IsNewTaskManagerViewEnabled())
-    return base::WrapUnique(new TaskManagerTesterImpl(callback));
-  else
+#if defined(OS_MACOSX)
+  if (!IsNewTaskManagerViewEnabled())
     return task_manager::CreateLegacyTaskManagerTester(callback);
+#endif  // defined(OS_MACOSX)
+
+  return base::WrapUnique(new TaskManagerTesterImpl(callback));
 }
 
 }  // namespace task_management