[making a diff] 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 <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 31 matching lines @@
 #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() {
-#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)
+    task_management::TaskManagerTester::MaybeRefreshLegacyInstance();
   }
 
   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()));
 }