Make old task manager tests work against new task manager.

chrome/browser/ui/views/new_task_manager_view.cc

 // Copyright 2015 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/views/new_task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 35 matching lines @@
 NewTaskManagerView* g_task_manager_view = nullptr;
 
 }  // namespace
 
 NewTaskManagerView::~NewTaskManagerView() {
   // Delete child views now, while our table model still exists.
   RemoveAllChildViews(true);
 }
 
 // static
-void NewTaskManagerView::Show(Browser* browser) {
+task_management::TaskManagerTableModel* NewTaskManagerView::Show(
+    Browser* browser) {
   if (g_task_manager_view) {
     // If there's a Task manager window open already, just activate it.
     g_task_manager_view->GetWidget()->Activate();
-    return;
+    return g_task_manager_view->table_model_.get();
   }
 
   g_task_manager_view = new NewTaskManagerView();
 
   gfx::NativeWindow window = browser ? browser->window()->GetNativeWindow()
                                      : nullptr;
 #if defined(USE_ASH)
   if (!window)
     window = ash::wm::GetActiveWindow();
 #endif
@@ skipping 23 matching lines @@
   if (focus_manager)
     focus_manager->SetFocusedView(g_task_manager_view->tab_table_);
 
 #if defined(USE_ASH)
   gfx::NativeWindow native_window =
       g_task_manager_view->GetWidget()->GetNativeWindow();
   ash::SetShelfItemDetailsForDialogWindow(native_window,
                                           IDR_ASH_SHELF_ICON_TASK_MANAGER,
                                           native_window->title());
 #endif
+  return g_task_manager_view->table_model_.get();
 }
 
 // static
 void NewTaskManagerView::Hide() {
   if (g_task_manager_view)
     g_task_manager_view->GetWidget()->Close();
 }
 
 bool NewTaskManagerView::IsColumnVisible(int column_id) const {
   return tab_table_->IsColumnVisible(column_id);
@@ skipping 260 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
     g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_management