Merge browser/ui/password and browser/ui/passwords.

chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc

Index: chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc
diff --git a/chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc b/chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc
deleted file mode 100644
index 73ca3102708d7be30ad92b7351f80ea7debffdec..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2013 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 "base/strings/utf_string_conversions.h"
-#include "chrome/browser/password_manager/mock_password_store.h"
-#include "chrome/browser/password_manager/password_store_factory.h"
-#include "chrome/browser/ui/password/password_ui_view.h"
-#include "chrome/browser/ui/webui/options/password_manager_presenter.h"
-#include "chrome/test/base/testing_profile.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using base::ASCIIToUTF16;
-using testing::Eq;
-using testing::Property;
-
-class MockPasswordUIView : public passwords_ui::PasswordUIView {
- public:
-  explicit MockPasswordUIView(Profile* profile)
-      : profile_(profile), password_manager_presenter_(this) {
-    password_manager_presenter_.Initialize();
-  }
-  virtual ~MockPasswordUIView() {}
-  virtual Profile* GetProfile() OVERRIDE;
-  MOCK_METHOD2(ShowPassword, void(size_t, const string16&));
-  MOCK_METHOD2(SetPasswordList,
-               void(const ScopedVector<autofill::PasswordForm>&, bool));
-  MOCK_METHOD1(SetPasswordExceptionList,
-               void(const ScopedVector<autofill::PasswordForm>&));
-  options::PasswordManagerPresenter* GetPasswordManagerPresenter() {
-    return &password_manager_presenter_;
-  }
-
- private:
-  Profile* profile_;
-  options::PasswordManagerPresenter password_manager_presenter_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockPasswordUIView);
-};
-
-Profile* MockPasswordUIView::GetProfile() { return profile_; }
-
-namespace options {
-
-class PasswordManagerPresenterTest : public testing::Test {
- protected:
-  PasswordManagerPresenterTest() {}
-
-  virtual ~PasswordManagerPresenterTest() {}
-  virtual void SetUp() OVERRIDE {
-    PasswordStoreFactory::GetInstance()->SetTestingFactoryAndUse(
-        &profile_, MockPasswordStore::Build);
-    mock_controller_.reset(new MockPasswordUIView(&profile_));
-  }
-  void AddPasswordEntry(const GURL& origin,
-                        const std::string& user_name,
-                        const std::string& password);
-  void AddPasswordException(const GURL& origin);
-  void UpdateLists();
-  MockPasswordUIView* GetUIController() { return mock_controller_.get(); }
-
- private:
-  TestingProfile profile_;
-  scoped_ptr<MockPasswordUIView> mock_controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(PasswordManagerPresenterTest);
-};
-
-void PasswordManagerPresenterTest::AddPasswordEntry(
-    const GURL& origin,
-    const std::string& user_name,
-    const std::string& password) {
-  autofill::PasswordForm* form = new autofill::PasswordForm();
-  form->origin = origin;
-  form->username_element = ASCIIToUTF16("Email");
-  form->username_value = ASCIIToUTF16(user_name);
-  form->password_element = ASCIIToUTF16("Passwd");
-  form->password_value = ASCIIToUTF16(password);
-  mock_controller_->GetPasswordManagerPresenter()->password_list_
-      .push_back(form);
-}
-
-void PasswordManagerPresenterTest::AddPasswordException(const GURL& origin) {
-  autofill::PasswordForm* form = new autofill::PasswordForm();
-  form->origin = origin;
-  mock_controller_->GetPasswordManagerPresenter()->password_exception_list_
-      .push_back(form);
-}
-
-void PasswordManagerPresenterTest::UpdateLists() {
-  mock_controller_->GetPasswordManagerPresenter()->SetPasswordList();
-  mock_controller_->GetPasswordManagerPresenter()->SetPasswordExceptionList();
-}
-
-namespace {
-
-TEST_F(PasswordManagerPresenterTest, UIControllerIsCalled) {
-  EXPECT_CALL(
-      *GetUIController(),
-      SetPasswordList(
-          Property(&ScopedVector<autofill::PasswordForm>::size, Eq(0u)), true));
-  EXPECT_CALL(*GetUIController(),
-              SetPasswordExceptionList(Property(
-                  &ScopedVector<autofill::PasswordForm>::size, Eq(0u))));
-  UpdateLists();
-  GURL pass_origin("http://abc1.com");
-  AddPasswordEntry(pass_origin, "test@gmail.com", "test");
-  EXPECT_CALL(
-      *GetUIController(),
-      SetPasswordList(
-          Property(&ScopedVector<autofill::PasswordForm>::size, Eq(1u)), true));
-  EXPECT_CALL(*GetUIController(),
-              SetPasswordExceptionList(Property(
-                  &ScopedVector<autofill::PasswordForm>::size, Eq(0u))));
-  UpdateLists();
-  GURL except_origin("http://abc2.com");
-  AddPasswordException(except_origin);
-  EXPECT_CALL(
-      *GetUIController(),
-      SetPasswordList(
-          Property(&ScopedVector<autofill::PasswordForm>::size, Eq(1u)), true));
-  EXPECT_CALL(*GetUIController(),
-              SetPasswordExceptionList(Property(
-                  &ScopedVector<autofill::PasswordForm>::size, Eq(1u))));
-  UpdateLists();
-  GURL pass_origin2("http://example.com");
-  AddPasswordEntry(pass_origin2, "test@gmail.com", "test");
-  EXPECT_CALL(
-      *GetUIController(),
-      SetPasswordList(
-          Property(&ScopedVector<autofill::PasswordForm>::size, Eq(2u)), true));
-  EXPECT_CALL(*GetUIController(),
-              SetPasswordExceptionList(Property(
-                  &ScopedVector<autofill::PasswordForm>::size, Eq(1u))));
-  UpdateLists();
-}
-
-}  // namespace
-}  // namespace options