Switch DomAutomationController to be a RenderFrameObserver.

chrome/browser/browser_keyevents_browsertest.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"

[Charlie Reis, 2014/02/15 01:47:33]

This doesn't look needed, right?

[mkosiba (inactive), 2014/02/17 17:42:31]

Done.

 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 // TODO(kbr): remove: http://crbug.com/222296
 #if defined(OS_MACOSX)
 #import "base/mac/mac_util.h"
 #endif
 
 using content::DomOperationNotificationDetails;
 using content::NavigationController;
-using content::RenderViewHost;
+using content::RenderFrameHost;

[Charlie Reis, 2014/02/15 01:47:33]

Unneeded?

[mkosiba (inactive), 2014/02/17 17:42:31]

Done.

 
 namespace {
 
 const char kTestingPage[] = "/keyevents_test.html";
 const char kSuppressEventJS[] =
     "window.domAutomationController.send(setDefaultAction('%ls', %ls));";
 const char kGetResultJS[] =
     "window.domAutomationController.send(keyEventResult[%d]);";
 const char kGetResultLengthJS[] =
     "window.domAutomationController.send(keyEventResult.length);";
@@ skipping 40 matching lines @@
   const char* const result[kMaxResultLength];
 };
 
 const wchar_t* GetBoolString(bool value) {
   return value ? L"true" : L"false";
 }
 
 // A class to help wait for the finish of a key event test.
 class TestFinishObserver : public content::NotificationObserver {
  public:
-  explicit TestFinishObserver(RenderViewHost* render_view_host)
+  explicit TestFinishObserver(content::WebContents* web_contents)
       : finished_(false), waiting_(false) {
-    registrar_.Add(this, content::NOTIFICATION_DOM_OPERATION_RESPONSE,
-                   content::Source<RenderViewHost>(render_view_host));
+    registrar_.Add(this,
+                   content::NOTIFICATION_DOM_OPERATION_RESPONSE,
+                   content::Source<content::WebContents>(web_contents));
   }
 
   bool WaitForFinish() {
     if (!finished_) {
       waiting_ = true;
       content::RunMessageLoop();
       waiting_ = false;
     }
     return finished_;
   }
@@ skipping 150 matching lines @@
     // event.
     ASSERT_NO_FATAL_FAILURE(StartTest(tab_index, test.result_length));
     ASSERT_NO_FATAL_FAILURE(SuppressEvents(
         tab_index, test.suppress_keydown, test.suppress_keypress,
         test.suppress_keyup, test.suppress_textinput));
 
     // We need to create a finish observer before sending the key event,
     // because the test finished message might be arrived before returning
     // from the SendKeyPressSync() method.
     TestFinishObserver finish_observer(
-        browser()->tab_strip_model()->GetWebContentsAt(tab_index)->
-            GetRenderViewHost());
+        browser()->tab_strip_model()->GetWebContentsAt(tab_index));
 
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), test.key, test.ctrl, test.shift, test.alt, test.command));
     ASSERT_TRUE(finish_observer.WaitForFinish());
     ASSERT_NO_FATAL_FAILURE(CheckResult(
         tab_index, test.result_length, test.result));
   }
 
   std::string GetTestDataDescription(const KeyEventTestData& data) {
     std::string desc = base::StringPrintf(
@@ skipping 588 matching lines @@
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
   // Ctrl+Alt should have no effect.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 }
 #endif
 
 }  // namespace