Make old task manager tests work against new task manager.

chrome/browser/ui/cocoa/task_manager_mac.mm

 // Copyright (c) 2012 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/ui/cocoa/task_manager_mac.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 576 matching lines @@
 
 // static
 void TaskManagerMac::Hide() {
   if (instance_)
     [instance_->window_controller_ close];
 }
 
 namespace chrome {
 
 // Declared in browser_dialogs.h.
-void ShowTaskManager(Browser* browser) {
-  if (chrome::ToolkitViewsDialogsEnabled()) {
-    chrome::ShowTaskManagerViews(browser);
-    return;
-  }
+ui::TableModel* ShowTaskManager(Browser* browser) {
+  if (chrome::ToolkitViewsDialogsEnabled())
+    return chrome::ShowTaskManagerViews(browser);
 
   TaskManagerMac::Show();
+  return nullptr;  // No ui::TableModel* to return on Mac, so return nullptr.
 }
 
 void HideTaskManager() {
   if (chrome::ToolkitViewsDialogsEnabled()) {
     chrome::HideTaskManagerViews();
     return;
   }
 
   TaskManagerMac::Hide();
 }
 
 }  // namespace chrome