Separate RenderViewHost from RenderWidgetHost, part 4: delegate

chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc

 /*
  * Copyright 2013 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h"
 
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 81 matching lines @@
   input_method->ShowImeIfNeeded();
 }
 
 content::RenderViewHost* VirtualKeyboardBrowserTest::GetKeyboardRenderViewHost(
     const std::string& id) {
   ShowVirtualKeyboard();
   GURL url = extensions::Extension::GetBaseURLFromExtensionId(id);
   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;
   return NULL;
 }
 
 void VirtualKeyboardBrowserTest::InjectJavascript(const base::FilePath& dir,
                                                   const base::FilePath& file) {
   base::FilePath path = ui_test_utils::GetTestFilePath(dir, file);
   std::string library_content;
@@ skipping 66 matching lines @@
   bool success = false;
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       browser_rvh,
       "success ? verifyInput('a') : waitForInput('a');",
       &success));
   ASSERT_TRUE(success);
 }
 
 // TODO(kevers|rsadam|bshe):  Add UI tests for remaining virtual keyboard
 // functionality.