Fix keyboard focus for OOPIF-<webview>.

chrome/browser/apps/guest_view/web_view_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 <queue>
 #include <set>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
@@ skipping 851 matching lines @@
 
 class WebViewSizeTest : public WebViewTest {};
 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewSizeTest, testing::Bool());
 
 class WebViewVisibilityTest : public WebViewTest {};
 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewVisibilityTest, testing::Bool());
 
 class WebViewSpeechAPITest : public WebViewTest {};
 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewSpeechAPITest, testing::Bool());
 
-// The following test suits are created to group tests based on specific
+// The following test suites are created to group tests based on specific
 // features of <webview>.
-// These features current would not work with
+// These features currently would not work with
 // --use-cross-process-frames-for-guest and is disabled on
 // UseCrossProcessFramesForGuests.
+// TODO(avallee): https://crbug.com/610795: Enable this for testing::Bool().
 class WebViewAccessibilityTest : public WebViewTest {};
 INSTANTIATE_TEST_CASE_P(WebViewTests,
                         WebViewAccessibilityTest,
                         testing::Values(false));
 
 
 class WebViewDPITest : public WebViewTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebViewTest::SetUpCommandLine(command_line);
@@ skipping 363 matching lines @@
   ASSERT_EQ(1u, guest_contents_list.size());
   content::WebContents* guest_contents = guest_contents_list[0];
 
   const gfx::Rect embedder_rect = embedder_contents->GetContainerBounds();
   const gfx::Rect guest_rect = guest_contents->GetContainerBounds();
   const gfx::Point click_point(guest_rect.x() - embedder_rect.x() + 10,
                                guest_rect.y() - embedder_rect.y() + 10);
 
   // Important, pass mouse click to embedder in order to transfer focus. Note
   // that SelectControlWaiter may be waited ealier than click is completed.
-  LeftMouseClick mouse_click(embedder_contents);
+  LeftMouseClick mouse_click(GetParam() ? guest_contents : embedder_contents);
   SelectControlWaiter select_control_waiter;
 
   for (int i = 0; i < 5; ++i) {
     const int click_duration_ms = 10 + i * 25;
     mouse_click.Click(click_point, click_duration_ms);
     select_control_waiter.Wait(true);
     mouse_click.Wait();
 
     mouse_click.Click(click_point, click_duration_ms);
     select_control_waiter.Wait(false);
@@ skipping 2544 matching lines @@
   gfx::Point embedder_origin =
       GetEmbedderWebContents()->GetContainerBounds().origin();
   guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y());
 
   // Generate and send synthetic touch event.
   content::SimulateTouchPressAt(GetEmbedderWebContents(),
                                 guest_rect.CenterPoint());
   EXPECT_TRUE(aura_webview->HasFocus());
 }
 #endif