Remove the old task manager view

chrome/browser/task_management/task_manager_browsertest.cc

 // Copyright 2016 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/task_manager.h"
-
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window_testing.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_management/task_manager_browsertest_util.h"
+#include "chrome/browser/task_management/task_manager_interface.h"
 #include "chrome/browser/task_management/task_manager_tester.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/task_manager/task_manager.h"
+#endif  // defined(OS_MACOSX)
+
 using content::WebContents;
 using task_management::browsertest_util::ColumnSpecifier;
 using task_management::browsertest_util::MatchAboutBlankTab;
 using task_management::browsertest_util::MatchAnyApp;
 using task_management::browsertest_util::MatchAnyExtension;
 using task_management::browsertest_util::MatchAnySubframe;
 using task_management::browsertest_util::MatchAnyTab;
 using task_management::browsertest_util::MatchAnyUtility;
 using task_management::browsertest_util::MatchApp;
 using task_management::browsertest_util::MatchExtension;
@@ skipping 26 matching lines @@
 
   void HideTaskManager() {
     model_.reset();
 
     // Hide the task manager, and wait for it to go.
     chrome::HideTaskManager();
     base::RunLoop().RunUntilIdle();  // OnWindowClosed happens asynchronously.
   }
 
   void Refresh() {
-    // Refresh() isn't ever needed on the new task manager.
-    if (switches::NewTaskManagerEnabled())
-      return;
-    TaskManager::GetInstance()->model()->Refresh();
+#if defined(OS_MACOSX)
+    // On Mac, the old task manager might still be used if we are not using mac
+    // views. Refresh() isn't ever needed on the new task manager.
+    if (!task_management::TaskManagerInterface::IsNewTaskManagerEnabled())
+      TaskManager::GetInstance()->model()->Refresh();
+#endif  // defined(OS_MACOSX)
   }
 
   GURL GetTestURL() {
     return ui_test_utils::GetTestUrl(
         base::FilePath(base::FilePath::kCurrentDirectory),
         base::FilePath(kTitle1File));
   }
 
   int FindResourceIndex(const base::string16& title) {
     for (int i = 0; i < model_->GetRowCount(); ++i) {
@@ skipping 1072 matching lines @@
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 
   HideTaskManager();
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }