Index: chrome/browser/tab_contents/render_view_context_menu_browsertest.cc |
diff --git a/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc b/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc |
index ea5f0a167e3270d2356ce363b626bb277637ae7e..34ed6d752e07e75fd17676540df55db9393e4c00 100644 |
--- a/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc |
+++ b/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc |
@@ -12,7 +12,7 @@ |
#include "chrome/browser/tab_contents/render_view_context_menu_browsertest_util.h" |
#include "chrome/browser/tab_contents/render_view_context_menu_test_util.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/common/chrome_notification_types.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chrome/test/base/ui_test_utils.h" |
@@ -39,7 +39,8 @@ class ContextMenuBrowserTest : public InProcessBrowserTest { |
params.media_type = WebKit::WebContextMenuData::MediaTypeNone; |
params.unfiltered_link_url = unfiltered_url; |
params.link_url = url; |
- WebContents* web_contents = chrome::GetActiveWebContents(browser()); |
+ WebContents* web_contents = |
+ browser()->tab_strip_model()->GetActiveWebContents(); |
params.page_url = web_contents->GetController().GetActiveEntry()->GetURL(); |
#if defined(OS_MACOSX) |
params.writing_direction_default = 0; |
@@ -47,7 +48,7 @@ class ContextMenuBrowserTest : public InProcessBrowserTest { |
params.writing_direction_right_to_left = 0; |
#endif // OS_MACOSX |
TestRenderViewContextMenu* menu = new TestRenderViewContextMenu( |
- chrome::GetActiveWebContents(browser()), params); |
+ browser()->tab_strip_model()->GetActiveWebContents(), params); |
menu->Init(); |
return menu; |
} |
@@ -100,7 +101,8 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, |
mouse_event.x = 15; |
mouse_event.y = 15; |
gfx::Rect offset; |
- content::WebContents* tab = chrome::GetActiveWebContents(browser()); |
+ content::WebContents* tab = |
+ browser()->tab_strip_model()->GetActiveWebContents(); |
tab->GetView()->GetContainerBounds(&offset); |
mouse_event.globalX = 15 + offset.x(); |
mouse_event.globalY = 15 + offset.y(); |