Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_test.cc

 // Copyright 2014 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/browser/ui/passwords/manage_passwords_test.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 51 matching lines @@
 void ManagePasswordsTest::SetupAutomaticPassword() {
   password_manager::StubPasswordManagerClient client;
   password_manager::StubPasswordManagerDriver driver;
   scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
       new password_manager::PasswordFormManager(
           NULL, &client, driver.AsWeakPtr(), *test_form(), false));
   GetController()->OnAutomaticPasswordSave(test_form_manager.Pass());
 }
 
 void ManagePasswordsTest::SetupBlackistedPassword() {
-  base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
+  test_form()->blacklisted_by_user = true;
+  test_form()->username_value.clear();
   autofill::PasswordFormMap map;
-  map[kTestUsername] = test_form();
+  map[test_form()->username_value] = test_form();
   GetController()->OnBlacklistBlockedAutofill(map);
 }
 
 void ManagePasswordsTest::SetupChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_credentials,
     ScopedVector<autofill::PasswordForm> federated_credentials,
     const GURL& origin) {
   base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
   autofill::PasswordFormMap map;
   map[kTestUsername] = test_form();
@@ skipping 12 matching lines @@
   // Ensure that everything has been properly recorded before pulling samples.
   content::RunAllPendingInMessageLoop();
   return histogram_tester_.GetHistogramSamplesSinceCreation(histogram)
       .release();
 }
 
 ManagePasswordsUIController* ManagePasswordsTest::GetController() {
   return ManagePasswordsUIController::FromWebContents(
       browser()->tab_strip_model()->GetActiveWebContents());
 }