Re-land r248110 with ASAN error fixed.

chrome/test/base/chrome_render_view_test.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 "chrome/test/base/chrome_render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/chrome_v8_context_set.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "components/autofill/content/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/autofill/content/renderer/test_password_autofill_agent.h"
+#include "components/autofill/content/renderer/test_password_generation_agent.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/extension.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 #if defined(OS_LINUX) && !defined(USE_AURA)
 #include "ui/base/gtk/event_synthesis_gtk.h"
 #endif
 
 using blink::WebFrame;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebScriptController;
 using blink::WebScriptSource;
 using blink::WebString;
 using blink::WebURLRequest;
 using autofill::AutofillAgent;
 using autofill::PasswordAutofillAgent;
+using autofill::PasswordGenerationAgent;
 
 ChromeRenderViewTest::ChromeRenderViewTest() : extension_dispatcher_(NULL) {
 }
 
 ChromeRenderViewTest::~ChromeRenderViewTest() {
 }
 
 void ChromeRenderViewTest::SetUp() {
   chrome_render_thread_ = new ChromeMockRenderThread();
   render_thread_.reset(chrome_render_thread_);
 
   content::SetRendererClientForTesting(&chrome_content_renderer_client_);
   extension_dispatcher_ = new extensions::Dispatcher();
   chrome_content_renderer_client_.SetExtensionDispatcher(extension_dispatcher_);
 #if defined(ENABLE_SPELLCHECK)
   chrome_content_renderer_client_.SetSpellcheck(new SpellCheck());
 #endif
 
   content::RenderViewTest::SetUp();
 
-  // RenderView doesn't expose its PasswordAutofillAgent or AutofillAgent
-  // objects, because it has no need to store them directly (they're stored as
-  // RenderViewObserver*).  So just create another set.
+  // RenderView doesn't expose its Agent objects, because it has no need to
+  // store them directly (they're stored as RenderViewObserver*).  So just
+  // create another set.
   password_autofill_ = new autofill::TestPasswordAutofillAgent(view_);
-  autofill_agent_ = new AutofillAgent(view_, password_autofill_);
+  password_generation_ = new autofill::TestPasswordGenerationAgent(view_);
+  autofill_agent_ =
+      new AutofillAgent(view_, password_autofill_, password_generation_);
 }
 
 void ChromeRenderViewTest::TearDown() {
   extension_dispatcher_->OnRenderProcessShutdown();
   extension_dispatcher_ = NULL;
 
   content::RenderViewTest::TearDown();
 }