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

chrome/browser/ui/passwords/password_manager_presenter_unittest.cc

 // 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/browser/ui/passwords/password_manager_presenter.h"
+#include "chrome/browser/ui/passwords/password_ui_view.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 {
+class MockPasswordUIView : public 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() {
+  PasswordManagerPresenter* GetPasswordManagerPresenter() {
     return &password_manager_presenter_;
   }
 
  private:
   Profile* profile_;
-  options::PasswordManagerPresenter password_manager_presenter_;
+  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_));
   }
@@ skipping 74 matching lines @@
       *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