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

Unified Diff: chrome/browser/history/multipart_browsertest.cc

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 7 years, 11 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
« no previous file with comments | « chrome/browser/history/history_browsertest.cc ('k') | chrome/browser/history/redirect_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/multipart_browsertest.cc
diff --git a/chrome/browser/history/multipart_browsertest.cc b/chrome/browser/history/multipart_browsertest.cc
index 7b86bca8bc4bb1ebbaf88383282761c165f266f0..2e40265b534a7671ec348c50b69814d898d429bb 100644
--- a/chrome/browser/history/multipart_browsertest.cc
+++ b/chrome/browser/history/multipart_browsertest.cc
@@ -5,7 +5,7 @@
#include "base/file_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
@@ -36,11 +36,11 @@ IN_PROC_BROWSER_TEST_F(MultipartResponseTest, DISABLED_SingleVisit) {
// creates one entry in the visits table.
ASSERT_TRUE(test_server()->Start());
- Observe(chrome::GetActiveWebContents(browser()));
+ Observe(browser()->tab_strip_model()->GetActiveWebContents());
ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("multipart"));
EXPECT_EQ(ASCIIToUTF16("page 9"),
- chrome::GetActiveWebContents(browser())->GetTitle());
+ browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
EXPECT_EQ(1, update_history_count_);
EXPECT_GT(did_navigate_any_frame_count_, update_history_count_);
}
« no previous file with comments | « chrome/browser/history/history_browsertest.cc ('k') | chrome/browser/history/redirect_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698