polychrome: use Views task manager for TaskManagerView browser test

Before, this was trying to use the Cocoa TaskManager for these Views-specific
tests, which is wrong.

This change also makes polychrome always use the Views task manager window when
in Views browser mode.

Bug: 817408
Change-Id: Ie3ab2e5fd6ca1752aff4f601e2cf920a3762fefe
Reviewed-on: https://chromium-review.googlesource.com/961161Reviewed-by: Sarah Chan <spqchan@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542873}

chrome/browser/ui/cocoa/task_manager_mac.mm

@@ -14,6 +14,7 @@
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
+#include "build/buildflag.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/task_manager/task_manager_interface.h"
@@ -21,6 +22,7 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/browser/ui/task_manager/task_manager_columns.h"
+#include "chrome/browser/ui/views_mode_controller.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
@@ -39,6 +41,10 @@ NSString* ColumnIdentifier(int id) {
 }
 
 bool ShouldUseViewsTaskManager() {
+#if BUILDFLAG(MAC_VIEWS_BROWSER)
+  if (!views_mode_controller::IsViewsBrowserCocoa())
+    return true;
+#endif
   return base::FeatureList::IsEnabled(features::kViewsTaskManager);
 }
 

chrome/browser/ui/views/task_manager_view_browsertest.cc

@@ -7,6 +7,8 @@
 #include "base/macros.h"
 #include "base/strings/pattern.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
@@ -20,6 +22,7 @@
 #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/task_manager_view.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -39,7 +42,11 @@ using browsertest_util::WaitForTaskManagerRows;
 
 class TaskManagerViewTest : public InProcessBrowserTest {
  public:
-  TaskManagerViewTest() {}
+  TaskManagerViewTest() {
+#if defined(OS_MACOSX)
+    feature_list_.InitAndEnableFeature(features::kViewsTaskManager);
+#endif
+  }
   ~TaskManagerViewTest() override {}
 
   void SetUpOnMainThread() override {
@@ -104,6 +111,8 @@ class TaskManagerViewTest : public InProcessBrowserTest {
   }
 
  private:
+  base::test::ScopedFeatureList feature_list_;
+
   DISALLOW_COPY_AND_ASSIGN(TaskManagerViewTest);
 };