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

Unified Diff: chrome/browser/extensions/extension_browsertests_misc.cc

Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac yet again Created 8 years, 12 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/extensions/extension_browsertests_misc.cc
===================================================================
--- chrome/browser/extensions/extension_browsertests_misc.cc (revision 116244)
+++ chrome/browser/extensions/extension_browsertests_misc.cc (working copy)
@@ -25,10 +25,11 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/site_instance.h"
-#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
#include "net/base/net_util.h"
#include "net/test/test_server.h"
#include "webkit/glue/webpreferences.h"
@@ -126,9 +127,7 @@
ExtensionProcessManager* manager =
browser()->profile()->GetExtensionProcessManager();
ExtensionHost* host = FindHostWithPath(manager, "/backgroundpage.html", 1);
- WebPreferences prefs =
- static_cast<RenderViewHostDelegate*>(host->host_contents())->
- GetWebkitPrefs();
+ WebPreferences prefs = host->render_view_host()->delegate()->GetWebkitPrefs();
ASSERT_FALSE(prefs.experimental_webgl_enabled);
ASSERT_FALSE(prefs.accelerated_compositing_enabled);
ASSERT_FALSE(prefs.accelerated_2d_canvas_enabled);
@@ -813,7 +812,7 @@
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
content::Source<content::NavigationController>(
- &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+ &browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
observer.Wait();
@@ -840,7 +839,7 @@
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
content::Source<content::NavigationController>(
- &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+ &browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
observer.Wait();
@@ -929,7 +928,7 @@
ASSERT_EQ(2, tab_strip->count());
EXPECT_EQ(extension->GetResourceURL("options.html"),
- tab_strip->GetTabContentsAt(1)->tab_contents()->GetURL());
+ tab_strip->GetTabContentsAt(1)->web_contents()->GetURL());
}
//==============================================================================
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/browser/extensions/extension_cookies_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698