Revert 253010 "Revert 251563 "Move browser initiated navigation ..."

trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc

Index: trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc
===================================================================
--- trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc	(revision 254165)
+++ trunk/src/content/renderer/accessibility/renderer_accessibility_browsertest.cc	(working copy)
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
-#include "content/common/view_messages.h"
+#include "content/common/frame_messages.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/accessibility/renderer_accessibility_complete.h"
 #include "content/renderer/render_view_impl.h"
@@ -62,6 +62,10 @@
     return static_cast<RenderViewImpl*>(view_);
   }
 
+  RenderFrameImpl* frame() {
+    return static_cast<RenderFrameImpl*>(view()->GetMainRenderFrame());
+  }
+
   virtual void SetUp() {
     RenderViewTest::SetUp();
     sink_ = &render_thread_->sink();
@@ -92,6 +96,7 @@
   IPC::TestSink* sink_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityTest);
+
 };
 
 TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
@@ -354,15 +359,15 @@
   // message that was queued up before will be quickly discarded
   // because the element it was referring to no longer exists,
   // so the event here is from loading this new page.
-  ViewMsg_Navigate_Params nav_params;
+  FrameMsg_Navigate_Params nav_params;
   nav_params.url = GURL("data:text/html,<p>Hello, again.</p>");
-  nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+  nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   nav_params.transition = PAGE_TRANSITION_TYPED;
   nav_params.current_history_list_length = 1;
   nav_params.current_history_list_offset = 0;
   nav_params.pending_history_list_offset = 1;
   nav_params.page_id = -1;
-  view()->OnNavigate(nav_params);
+  frame()->OnNavigate(nav_params);
   accessibility->SendPendingAccessibilityEvents();
   EXPECT_TRUE(sink_->GetUniqueMessageMatching(
       AccessibilityHostMsg_Events::ID));