Revert 113110 - backing out 113015 didn't fix the interactive test bot. Restoring the CL

chrome/browser/browser_focus_uitest.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "net/test/test_server.h"
 
 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN)
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 17 matching lines @@
 // TODO(jcampan): http://crbug.com/23683
 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage
 #elif defined(OS_MACOSX)
 // TODO(suzhe): http://crbug.com/60973 (following two tests)
 #define MAYBE_FocusTraversal DISABLED_FocusTraversal
 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial
 // TODO(suzhe): http://crbug.com/49737
 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage
 #elif defined(OS_WIN)
 // Disabled, http://crbug.com/62543.
-#define MAYBE_FocusTraversal DISABLED_FocusTraversal
+#define MAYBE_FocusTraversal FocusTraversal
 // Disabled, http://crbug.com/62544.
-#define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial
+#define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial
 // Flaky, http://crbug.com/62537.
 #define MAYBE_TabsRememberFocusFindInPage FLAKY_TabsRememberFocusFindInPage
 #endif
 
 namespace {
 
 // The delay waited in some cases where we don't have a notifications for an
 // action we take.
 const int kActionDelayMs = 500;
 
@@ skipping 86 matching lines @@
   }
 
   virtual TabContents* tab() {
     return InterstitialPage::tab();
   }
 
   bool HasFocus() {
     return render_view_host()->view()->HasFocus();
   }
 
- protected:
-  bool OnMessageReceived(const IPC::Message& message) {
-    bool handled = true;
-    IPC_BEGIN_MESSAGE_MAP(TestInterstitialPage, message)
-      IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnFocusedNodeChanged)
-      IPC_MESSAGE_UNHANDLED(handled = false)
-    IPC_END_MESSAGE_MAP()
-    return handled;
-  }
-
-  void OnFocusedNodeChanged(bool is_editable_node) {
-    content::NotificationService::current()->Notify(
-        content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-        content::Source<TabContents>(tab()),
-        content::Details<const bool>(&is_editable_node));
-  }
-
  private:
   std::string html_contents_;
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) {
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 #if defined(OS_POSIX)
   // It seems we have to wait a little bit for the widgets to spin up before
   // we can start clicking on them.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
@@ skipping 301 matching lines @@
       if (j < arraysize(kExpElementIDs) - 1) {
         // If the next element is the kTextElementID, we expect to be
         // notified we have switched to an editable node.
         bool is_editable_node =
             (strcmp(kTextElementID, kExpElementIDs[j + 1]) == 0);
         content::Details<bool> details(&is_editable_node);
 
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWaitWithDetails(
             browser(), ui::VKEY_TAB, false, false, false, false,
             content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-            content::NotificationSource(content::Source<TabContents>(
-                browser()->GetSelectedTabContents())),
+            content::NotificationSource(content::Source<RenderViewHost>(
+                browser()->GetSelectedTabContents()->render_view_host())),
             details));
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
             browser(), ui::VKEY_TAB, false, false, false, false,
             chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER,
             content::NotificationSource(content::Source<Browser>(browser()))));
       }
     }
 
@@ skipping 21 matching lines @@
 
       if (j < arraysize(kExpElementIDs) - 1) {
         // If the next element is the kTextElementID, we expect to be
         // notified we have switched to an editable node.
         bool is_editable_node = (strcmp(kTextElementID, next_element) == 0);
         content::Details<bool> details(&is_editable_node);
 
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWaitWithDetails(
             browser(), ui::VKEY_TAB, false, true, false, false,
             content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
-            content::NotificationSource(content::Source<TabContents>(
-                browser()->GetSelectedTabContents())),
+            content::NotificationSource(content::Source<RenderViewHost>(
+                browser()->GetSelectedTabContents()->render_view_host())),
             details));
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
             browser(), ui::VKEY_TAB, false, true, false, false,
             chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER,
             content::NotificationSource(content::Source<Browser>(browser()))));
       }
 
       // Let's make sure the focus is on the expected element in the page.
@@ skipping 62 matching lines @@
           interstitial_page->render_view_host(), L"",
           L"window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
 
       int notification_type;
       content::NotificationSource notification_source =
           content::NotificationService::AllSources();
       if (j < arraysize(kExpElementIDs) - 1) {
         notification_type = content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE;
-        notification_source = content::Source<TabContents>(
-            interstitial_page->tab());
+        notification_source = content::Source<RenderViewHost>(
+            interstitial_page->render_view_host());
       } else {
         // On the last tab key press, the focus returns to the browser.
         notification_type = chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER;
         notification_source = content::Source<Browser>(browser());
       }
 
       ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
           browser(), ui::VKEY_TAB, false, false, false, false,
           notification_type, notification_source));
     }
@@ skipping 13 matching lines @@
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), ui::VKEY_END, false, false, false, false));
 
     // Now let's press shift-tab to move the focus in reverse.
     for (size_t j = 0; j < 7; ++j) {
       int notification_type;
       content::NotificationSource notification_source =
           content::NotificationService::AllSources();
       if (j < arraysize(kExpElementIDs) - 1) {
         notification_type = content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE;
-        notification_source = content::Source<TabContents>(
-            interstitial_page->tab());
+        notification_source = content::Source<RenderViewHost>(
+            interstitial_page->render_view_host());
       } else {
         // On the last tab key press, the focus returns to the browser.
         notification_type = chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER;
         notification_source = content::Source<Browser>(browser());
       }
 
       ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
           browser(), ui::VKEY_TAB, false, true, false, false,
           notification_type, notification_source));
 
@@ skipping 217 matching lines @@
     browser()->Reload(CURRENT_TAB);
     observer.Wait();
   }
 
   // Focus should now be on the tab contents.
   browser()->ShowDownloadsTab();
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 }
 
 }  // namespace