<webview>: Correctly shift focus between WebContents.

chrome/browser/apps/guest_view/web_view_interactive_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 <stddef.h>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
@@ skipping 1343 matching lines @@
       "WebViewInteractiveTest.WebViewButtonWasFocused");
   SendMessageToEmbedder("verify");
   EXPECT_TRUE(webview_button_not_focused_listener.WaitUntilSatisfied());
 }
 
 IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, KeyboardFocus) {
   TestHelper("testKeyboardFocus", "web_view/focus", NO_TEST_SERVER);
 
   EXPECT_EQ(embedder_web_contents()->GetFocusedFrame(),
             embedder_web_contents()->GetMainFrame());
   content::FrameFocusedObserver focus_observer(

[lfg, 2016/10/27 20:00:35]

Is this still needed?

[avallee, 2016/10/28 19:19:56]

Gone.

       guest_web_contents()->GetMainFrame());
   ExtensionTestMessageListener next_step_listener("TEST_STEP_PASSED", false);
   next_step_listener.set_failure_message("TEST_STEP_FAILED");
   {
     gfx::Rect offset = embedder_web_contents()->GetContainerBounds();
     // Click the <input> element inside the <webview>.
     // If we wanted, we could ask the embedder to compute an appropriate point.
     MoveMouseInsideWindow(gfx::Point(offset.x() + 40, offset.y() + 40));
     SendMouseClick(ui_controls::LEFT);
   }
 
   // Waits for the renderer to know the input has focus.
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
-  // Wait for the browser to know which frame has focus.
-  focus_observer.Wait();
-  if (GetParam())
-    EXPECT_EQ(embedder_web_contents()->GetFocusedFrame(), nullptr);

[alexmos, 2016/10/28 06:36:39]

Why isn't this needed anymore?

[avallee, 2016/10/28 19:19:56]

This is no longer needed as the click itself is what causes the focus change to
happen. This happens synchronously before dispatching the event to the renderer
such that once we see the input as focused, we're guaranteed that input will end
up there.

 
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_A, false, false, false, false));
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_B, false, true, false, false));
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_C, false, false, false, false));
 
   next_step_listener.Reset();
   EXPECT_TRUE(content::ExecuteScript(
       embedder_web_contents(),
       "window.runCommand('testKeyboardFocusRunNextStep', 'aBc');"));
 
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
 }