Introduce RenderView::Observer interface so that RenderView doesn't have to k...

chrome/test/render_view_test.cc

 // Copyright (c) 2010 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 "chrome/test/render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/dom_storage_common.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
+#include "chrome/renderer/autofill_helper.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/mock_render_process.h"
+#include "chrome/renderer/password_autocomplete_manager.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ skipping 99 matching lines @@
                              kOpenerId,
                              RendererPreferences(),
                              WebPreferences(),
                              new SharedRenderViewCounter(0),
                              kRouteId,
                              kInvalidSessionStorageNamespaceId,
                              string16());
 
   // Attach a pseudo keyboard device to this object.
   mock_keyboard_.reset(new MockKeyboard());
+
+  // RenderView doesn't expose it's PasswordAutocompleteManager or
+  // AutoFillHelper objects, because it has no need to store them directly
+  // (they're stored as RenderViewObserver*).  So just create another set.
+  password_autocomplete_ = new PasswordAutocompleteManager(view_);
+  autofill_helper_ = new AutoFillHelper(view_, password_autocomplete_);
 }
 
 void RenderViewTest::TearDown() {
   // Try very hard to collect garbage before shutting down.
   GetMainFrame()->collectGarbage();
   GetMainFrame()->collectGarbage();
 
   render_thread_.SendCloseMessage();
 
   // Run the loop so the release task from the renderwidget executes.
@@ skipping 90 matching lines @@
   NOTIMPLEMENTED();
   return L'\0';
 #endif
 }
 
 void RenderViewTest::SendNativeKeyEvent(
     const NativeWebKeyboardEvent& key_event) {
   scoped_ptr<IPC::Message> input_message(new ViewMsg_HandleInputEvent(0));
   input_message->WriteData(reinterpret_cast<const char*>(&key_event),
                            sizeof(WebKit::WebKeyboardEvent));
-  view_->OnHandleInputEvent(*input_message);
+  view_->OnMessageReceived(*input_message);
 }
 
 void RenderViewTest::VerifyPageCount(int count) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
   const IPC::Message* page_cnt_msg =
       render_thread_.sink().GetUniqueMessageMatching(
           ViewHostMsg_DidGetPrintedPagesCount::ID);
   ASSERT_TRUE(page_cnt_msg);
   ViewHostMsg_DidGetPrintedPagesCount::Param post_page_count_param;
   ViewHostMsg_DidGetPrintedPagesCount::Read(page_cnt_msg,
@@ skipping 72 matching lines @@
   gfx::Rect bounds = GetElementBounds(element_id);
   if (bounds.IsEmpty())
     return false;
   WebMouseEvent mouse_event;
   mouse_event.type = WebInputEvent::MouseDown;
   mouse_event.button = WebMouseEvent::ButtonLeft;
   mouse_event.x = bounds.CenterPoint().x();
   mouse_event.y = bounds.CenterPoint().y();
   mouse_event.clickCount = 1;
   ViewMsg_HandleInputEvent input_event(0);
-  input_event.WriteData(reinterpret_cast<const char*>(&mouse_event),
-                        sizeof(WebMouseEvent));
-  view_->OnHandleInputEvent(input_event);
+  scoped_ptr<IPC::Message> input_message(new ViewMsg_HandleInputEvent(0));
+  input_message->WriteData(reinterpret_cast<const char*>(&mouse_event),
+                           sizeof(WebMouseEvent));
+  view_->OnMessageReceived(*input_message);
   return true;
 }