Switch DomAutomationController to be a RenderFrameObserver.

chrome/browser/browser_keyevents_browsertest.cc

Index: chrome/browser/browser_keyevents_browsertest.cc
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 5a11db8ab7000cac0f52dddf61bd7273bd05535d..d84605f5c3be44051ab74c90ff0dedcbd50613d7 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -20,7 +20,7 @@
 #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"
@@ -35,7 +35,7 @@
 
 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 {
 
@@ -96,10 +96,11 @@ const wchar_t* GetBoolString(bool value) {
 // 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() {
@@ -270,8 +271,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
     // 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));