Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/test/base/ui_test_utils.h

 // Copyright (c) 2011 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_TEST_BASE_UI_TEST_UTILS_H_
 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
 #pragma once
 
 #include <map>
 #include <queue>
@@ skipping 36 matching lines @@
 class ScopedTempDir;
 class SkBitmap;
 class TabContents;
 class TabContentsWrapper;
 class TemplateURLService;
 
 namespace browser {
 struct NavigateParams;
 }
 
+namespace content {
+class WebContents;
+}
+
 namespace gfx {
 class Size;
 }
 
 // A collections of functions designed for use with InProcessBrowserTest.
 namespace ui_test_utils {
 
 // Flags to indicate what to wait for in a navigation test.
 // They can be ORed together.
 // The order in which the waits happen when more than one is selected, is:
@@ skipping 32 matching lines @@
 // Waits for a new tab to be added to |browser|. TODO(gbillock): remove this
 // race hazard. Use WindowedNotificationObserver instead.
 void WaitForNewTab(Browser* browser);
 
 // Waits for a |browser_action| to be updated. TODO(gbillock): remove this race
 // hazard. Use WindowedNotificationObserver instead.
 void WaitForBrowserActionUpdated(ExtensionAction* browser_action);
 
 // Waits for a load stop for the specified |tab|'s controller, if the tab is
 // currently loading.  Otherwise returns immediately.
-void WaitForLoadStop(TabContents* tab);
+void WaitForLoadStop(content::WebContents* tab);
 
 // Waits for a new browser to be created, returning the browser.
 Browser* WaitForNewBrowser();
 
 // Opens |url| in an incognito browser window with the incognito profile of
 // |profile|, blocking until the navigation finishes. This will create a new
 // browser if a browser with the incognito profile does not exist.
 void OpenURLOffTheRecord(Profile* profile, const GURL& url);
 
 // Performs the provided navigation process, blocking until the navigation
@@ skipping 65 matching lines @@
 // The returned path is GURL format.
 GURL GetTestUrl(const FilePath& dir, const FilePath& file);
 
 // Generate a URL for a file path including a query string.
 GURL GetFileUrlWithQuery(const FilePath& path, const std::string& query_string);
 
 // Blocks until an application modal dialog is showns and returns it.
 AppModalDialog* WaitForAppModalDialog();
 
 // Causes the specified tab to crash. Blocks until it is crashed.
-void CrashTab(TabContents* tab);
+void CrashTab(content::WebContents* tab);
 
 // Performs a find in the page of the specified tab. Returns the number of
 // matches found.  |ordinal| is an optional parameter which is set to the index
 // of the current match.
 int FindInPage(TabContentsWrapper* tab,
                const string16& search_string,
                bool forward,
                bool case_sensitive,
                int* ordinal);
 
@@ skipping 359 matching lines @@
 
 // Takes a snapshot of the entire page, according to the width and height
 // properties of the DOM's document. Returns true on success. DOMAutomation
 // must be enabled.
 bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                             SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_UI_TEST_UTILS_H_