Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1032)

Unified Diff: chrome/browser/automation/automation_tab_helper_browsertest.cc

Issue 10536058: TabContentsWrapper -> TabContents, part 6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GetOwningTabContentsForWebContents Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/automation/automation_tab_helper_browsertest.cc
diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc
index 59ae8af41894097e940dd62a551594d22c8410f0..8f5ffe9d1055b8413ff6ae98db2f6be788515d75 100644
--- a/chrome/browser/automation/automation_tab_helper_browsertest.cc
+++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/automation/automation_tab_helper.h"
#include "chrome/browser/automation/mock_tab_event_observer.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/url_constants.h"
@@ -91,7 +91,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
std::string script = base::StringPrintf("runTestCase(%d);",
test_case_number);
content::RenderViewHost* host =
- browser()->GetSelectedWebContents()->GetRenderViewHost();
+ browser()->GetActiveWebContents()->GetRenderViewHost();
if (wait_for_response) {
ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
host, L"", ASCIIToWide(script)));
@@ -104,7 +104,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
// Returns the |AutomationTabHelper| for the first browser's first tab.
AutomationTabHelper* tab_helper() {
- return browser()->GetTabContentsWrapperAt(0)->automation_tab_helper();
+ return browser()->GetTabContentsAt(0)->automation_tab_helper();
}
protected:

Powered by Google App Engine
This is Rietveld 408576698