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

Unified Diff: chrome/browser/renderer_host/web_cache_manager_browsertest.cc

Issue 11419276: Remove tabstrip wrappers in browser_tabstrip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 8 years 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/renderer_host/web_cache_manager_browsertest.cc
diff --git a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
index 16b924d0cff2608a1c6cc06e3373e392ad231486..f4a5e4b197e0e9b1933b94066a26df5a68c9593a 100644
--- a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
+++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.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/render_process_host.h"
@@ -34,26 +34,26 @@ IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, CrashOnceOnly) {
chrome::NewTab(browser());
ui_test_utils::NavigateToURL(browser(), url);
- WebContents* tab = chrome::GetWebContentsAt(browser(), 0);
+ WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
ASSERT_TRUE(tab != NULL);
base::KillProcess(tab->GetRenderProcessHost()->GetHandle(),
content::RESULT_CODE_KILLED, true);
- chrome::ActivateTabAt(browser(), 0, true);
+ browser()->tab_strip_model()->ActivateTabAt(0, true);
chrome::NewTab(browser());
ui_test_utils::NavigateToURL(browser(), url);
- chrome::ActivateTabAt(browser(), 0, true);
+ browser()->tab_strip_model()->ActivateTabAt(0, true);
chrome::NewTab(browser());
ui_test_utils::NavigateToURL(browser(), url);
// We would have crashed at the above line with the bug.
- chrome::ActivateTabAt(browser(), 0, true);
+ browser()->tab_strip_model()->ActivateTabAt(0, true);
chrome::CloseTab(browser());
- chrome::ActivateTabAt(browser(), 0, true);
+ browser()->tab_strip_model()->ActivateTabAt(0, true);
chrome::CloseTab(browser());
- chrome::ActivateTabAt(browser(), 0, true);
+ browser()->tab_strip_model()->ActivateTabAt(0, true);
chrome::CloseTab(browser());
ui_test_utils::NavigateToURL(browser(), url);

Powered by Google App Engine
This is Rietveld 408576698