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

chrome/browser/ui/passwords/password_manager_presenter_unittest.cc

Index: chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
diff --git a/chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
similarity index 93%
rename from chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc
rename to chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
index 73ca3102708d7be30ad92b7351f80ea7debffdec..9fa6942a522d8ccac3ead0a01d82e4c81441646d 100644
--- a/chrome/browser/ui/webui/options/password_manager_presenter_unittest.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
@@ -5,8 +5,8 @@
 #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"
@@ -28,20 +28,20 @@ class MockPasswordUIView : public passwords_ui::PasswordUIView {
                void(const ScopedVector<autofill::PasswordForm>&, bool));
   MOCK_METHOD1(SetPasswordExceptionList,
                void(const ScopedVector<autofill::PasswordForm>&));
-  options::PasswordManagerPresenter* GetPasswordManagerPresenter() {
+  passwords_ui::PasswordManagerPresenter* GetPasswordManagerPresenter() {
     return &password_manager_presenter_;
   }
 
  private:
   Profile* profile_;
-  options::PasswordManagerPresenter password_manager_presenter_;
+  passwords_ui::PasswordManagerPresenter password_manager_presenter_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPasswordUIView);
 };
 
 Profile* MockPasswordUIView::GetProfile() { return profile_; }
 
-namespace options {
+namespace passwords_ui {

[Patrick Dubroy, 2013/11/13 11:38:07]

I'd drop the namespace here as well.

[shashi, 2013/11/13 17:44:22]

Done.

 
 class PasswordManagerPresenterTest : public testing::Test {
  protected:
@@ -137,4 +137,4 @@ TEST_F(PasswordManagerPresenterTest, UIControllerIsCalled) {
 }
 
 }  // namespace
-}  // namespace options
+}  // namespace passwords_ui