summaryrefslogtreecommitdiffstats
path: root/content/browser/webkit_browsertest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 22:22:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 22:22:03 +0000
commit52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17 (patch)
treef39b0d32959778625fdeb00f178061a6411213c3 /content/browser/webkit_browsertest.cc
parent78ce87fbedda14f033aaaf474b94c4966e8bf3d0 (diff)
downloadchromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.zip
chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.gz
chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.bz2
Move tab functions off Browser into browser_tabstrip and browser_tabrestore.
http://crbug.com/133576 TEST=none Review URL: https://chromiumcodereview.appspot.com/10702029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webkit_browsertest.cc')
-rw-r--r--content/browser/webkit_browsertest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/webkit_browsertest.cc b/content/browser/webkit_browsertest.cc
index a024d94..677a5d0 100644
--- a/content/browser/webkit_browsertest.cc
+++ b/content/browser/webkit_browsertest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/web_contents/web_contents_impl.h"
@@ -28,7 +29,7 @@ IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, AbortOnEnd) {
ui_test_utils::NavigateToURL(browser(), url);
- WebContents* web_contents = browser()->GetActiveWebContents();
+ WebContents* web_contents = chrome::GetActiveWebContents(browser());
// If you are seeing this test fail, please strongly investigate the
// possibility that http://crbug.com/75604 and
// https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before
@@ -52,6 +53,6 @@ IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) {
ui_test_utils::NavigateToURL(browser(), url);
- WebContents* web_contents = browser()->GetActiveWebContents();
+ WebContents* web_contents = chrome::GetActiveWebContents(browser());
EXPECT_FALSE(web_contents->IsCrashed());
}