Attempt to fix failing tests on the chrome frame builder.

The function to set keyboard focus to the chrome renderer window in a chrome frame instance
was sending the mouse click to the ancestor window, which is not correct. The ancestor window
is only needed to bring the whole hierarchy to the foreground.

Review URL: http://codereview.chromium.org/491026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34304 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 9f2a6de..f1ef010 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -441,10 +441,11 @@ void ShowChromeFrameContextMenu() {
 }
 
 void SetKeyboardFocusToWindow(HWND window, int x, int y) {
-  if (!IsTopLevelWindow(window)) {
-    window = GetAncestor(window, GA_ROOT);
+  HWND top_level_window = window;
+  if (!IsTopLevelWindow(top_level_window)) {
+    top_level_window = GetAncestor(window, GA_ROOT);
   }
-  ForceSetForegroundWindow(window);
+  ForceSetForegroundWindow(top_level_window);
 
   POINT cursor_position = {130, 130};
   ClientToScreen(window, &cursor_position);