[Password Manager] Unfriend PasswordAutofillAgentTest from PasswordAutofillAgent (clean-up).

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 "base/debug/leak_annotations.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/render_messages.h"
@@ skipping 28 matching lines @@
 using autofill::PasswordGenerationAgent;
 using blink::WebFrame;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebScriptController;
 using blink::WebScriptSource;
 using blink::WebString;
 using blink::WebURLRequest;
 
 ChromeRenderViewTest::ChromeRenderViewTest()
-    : password_autofill_(NULL),
+    : password_autofill_agent_(NULL),
       password_generation_(NULL),
       autofill_agent_(NULL),
       chrome_render_thread_(NULL) {
 }
 
 ChromeRenderViewTest::~ChromeRenderViewTest() {
 }
 
 void ChromeRenderViewTest::SetUp() {
   ChromeUnitTestSuite::InitializeProviders();
   ChromeUnitTestSuite::InitializeResourceBundle();
 
   chrome_render_thread_ = new ChromeMockRenderThread();
   render_thread_.reset(chrome_render_thread_);
 
   content::RenderViewTest::SetUp();
 
   // 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_);
+  password_autofill_agent_ = new autofill::TestPasswordAutofillAgent(view_);
   password_generation_ = new autofill::TestPasswordGenerationAgent(view_);
   autofill_agent_ =
-      new AutofillAgent(view_, password_autofill_, password_generation_);
+      new AutofillAgent(view_, password_autofill_agent_, password_generation_);
 }
 
 void ChromeRenderViewTest::TearDown() {
 #if defined(ENABLE_EXTENSIONS)
   ChromeContentRendererClient* client =
       static_cast<ChromeContentRendererClient*>(content_renderer_client_.get());
   client->GetExtensionDispatcherForTest()->OnRenderProcessShutdown();
 #endif
 
 #if defined(LEAK_SANITIZER)
@@ skipping 20 matching lines @@
   extension_dispatcher_delegate_.reset(
       new ChromeExtensionsDispatcherDelegate());
   client->SetExtensionDispatcherForTest(
       new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
 #endif
 #if defined(ENABLE_SPELLCHECK)
   client->SetSpellcheck(new SpellCheck());
 #endif
   return client;
 }