Make old task manager tests work against new task manager.

chrome/browser/ui/browser_dialogs.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
 
 #include "base/callback.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
@@ skipping 24 matching lines @@
 namespace gfx {
 class Point;
 }
 
 namespace net {
 class AuthChallengeInfo;
 class URLRequest;
 }
 
 namespace ui {
+class TableModel;
 class WebDialogDelegate;
 }
 
 namespace chrome {
 
 // Shows or hides the Task Manager. |browser| can be NULL when called from Ash.
-void ShowTaskManager(Browser* browser);
+// Returns a pointer to the underlying TableModel, which can be ignored, or used
+// for testing.
+ui::TableModel* ShowTaskManager(Browser* browser);
 void HideTaskManager();
 
 #if !defined(OS_MACOSX)
 // Creates and shows an HTML dialog with the given delegate and context.
 // The window is automatically destroyed when it is closed.
 // Returns the created window.
 //
 // Make sure to use the returned window only when you know it is safe
 // to do so, i.e. before OnDialogClosed() is called on the delegate.
 gfx::NativeWindow ShowWebDialog(gfx::NativeView parent,
@@ skipping 40 matching lines @@
 // bookmark star is clicked or "Bookmark This Page..." is selected from a menu
 // or via a key equivalent.
 void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point,
                                     gfx::NativeView parent,
                                     bookmarks::BookmarkBubbleObserver* observer,
                                     Browser* browser,
                                     const GURL& url,
                                     bool newly_bookmarked);
 
 // Bridging methods that show/hide the toolkit-views based Task Manager on Mac.
-void ShowTaskManagerViews(Browser* browser);
+ui::TableModel* ShowTaskManagerViews(Browser* browser);
 void HideTaskManagerViews();
 
 #endif  // OS_MACOSX
 
 #if defined(TOOLKIT_VIEWS)
 
 // Creates a toolkit-views based LoginHandler (e.g. HTTP-Auth dialog).
 LoginHandler* CreateLoginHandlerViews(net::AuthChallengeInfo* auth_info,
                                       net::URLRequest* request);
 
@@ skipping 17 matching lines @@
   DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleViewsBridge);
 };
 
 #endif  // OS_MACOSX
 
 #endif  // TOOLKIT_VIEWS
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_