Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

chrome/test/render_view_test.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 "chrome/test/render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/gfx_resource_provider.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/autofill/autofill_agent.h"
 #include "chrome/renderer/autofill/password_autofill_manager.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/print_web_view_helper.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "content/common/dom_storage_common.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/view_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
@@ skipping 99 matching lines @@
   for (size_t i = 0; i < Extension::kNumPermissions; ++i)
     all_permissions.insert(Extension::kPermissions[i].name);
   ExtensionProcessBindings::SetAPIPermissions("", all_permissions);
 
   mock_process_.reset(new MockRenderProcess);
 
   render_thread_.set_routing_id(kRouteId);
 
   // This needs to pass the mock render thread to the view.
   view_ = RenderView::Create(&render_thread_,
-                             0,
-                             kOpenerId,
-                             RendererPreferences(),
                              WebPreferences(),
                              new SharedRenderViewCounter(0),
                              kRouteId,
-                             kInvalidSessionStorageNamespaceId,
-                             string16());
+                             kInvalidSessionStorageNamespaceId);
+  view_->Init(0, kOpenerId, RendererPreferences(), string16(), NULL, NULL);
 
   // Attach a pseudo keyboard device to this object.
   mock_keyboard_.reset(new MockKeyboard());
 
-  // RenderView doesn't expose it's PasswordAutofillManager or
-  // AutofillAgent objects, because it has no need to store them directly
-  // (they're stored as RenderViewObserver*).  So just create another set.
+  // These RenderViewObserver are normally created in RenderViewWrapper.
+  // Manually creating them here.
   password_autofill_ = new PasswordAutofillManager(view_);
   autofill_agent_ = new AutofillAgent(view_, password_autofill_);
+  print_helper_ = new PrintWebViewHelper(view_);
 }
 
 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 191 matching lines @@
   mouse_event.x = bounds.CenterPoint().x();
   mouse_event.y = bounds.CenterPoint().y();
   mouse_event.clickCount = 1;
   ViewMsg_HandleInputEvent input_event(0);
   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;
 }