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

Unified Diff: chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc

Issue 1411203010: Separate RenderViewHost from RenderWidgetHost, part 4: delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oops Created 5 years, 2 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/chromeos/extensions/virtual_keyboard_browsertest.cc
diff --git a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
index 082e54b0da25ba1827bfd4a0e2619fb105b6922c..18401c9dbccbbd9f999973df468f6f9d661d1a35 100644
--- a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
@@ -99,15 +99,12 @@ content::RenderViewHost* VirtualKeyboardBrowserTest::GetKeyboardRenderViewHost(
scoped_ptr<content::RenderWidgetHostIterator> widgets(
content::RenderWidgetHost::GetRenderWidgetHosts());
while (content::RenderWidgetHost* widget = widgets->GetNextHost()) {
- if (widget->IsRenderView()) {
- content::RenderViewHost* view = content::RenderViewHost::From(widget);
- if (url == view->GetSiteInstance()->GetSiteURL()) {
- content::WebContents* wc =
- content::WebContents::FromRenderViewHost(view);
- // Waits for virtual keyboard to load.
- EXPECT_TRUE(content::WaitForLoadStop(wc));
- return view;
- }
+ content::RenderViewHost* view = content::RenderViewHost::From(widget);
+ if (view && url == view->GetSiteInstance()->GetSiteURL()) {
+ content::WebContents* wc = content::WebContents::FromRenderViewHost(view);
+ // Waits for virtual keyboard to load.
+ EXPECT_TRUE(content::WaitForLoadStop(wc));
+ return view;
}
}
LOG(ERROR) << "Extension not found:" << url;

Powered by Google App Engine
This is Rietveld 408576698