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

chrome/browser/ui/passwords/password_ui_view.h

Index: chrome/browser/ui/passwords/password_ui_view.h
diff --git a/chrome/browser/ui/password/password_ui_view.h b/chrome/browser/ui/passwords/password_ui_view.h
similarity index 86%
rename from chrome/browser/ui/password/password_ui_view.h
rename to chrome/browser/ui/passwords/password_ui_view.h
index cd9f1368f88249495f31eb9faec982dd0dae6246..be925f8c297b5aae9775ef87bdaf6174c47f1c22 100644
--- a/chrome/browser/ui/password/password_ui_view.h
+++ b/chrome/browser/ui/passwords/password_ui_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_PASSWORD_PASSWORD_UI_VIEW_H_
-#define CHROME_BROWSER_UI_PASSWORD_PASSWORD_UI_VIEW_H_
+#ifndef CHROME_BROWSER_UI_PASSWORDS_PASSWORD_UI_VIEW_H_
+#define CHROME_BROWSER_UI_PASSWORDS_PASSWORD_UI_VIEW_H_
 
 #include "base/memory/scoped_vector.h"
 
@@ -13,8 +13,6 @@ struct PasswordForm;
 
 class Profile;
 
-namespace passwords_ui {
-
 // An interface for a passwords UI View. A UI view is responsible for
 // displaying passwords in the UI and routing UI commands to the
 // PasswordManagerPresenter.
@@ -43,6 +41,4 @@ class PasswordUIView {
       const ScopedVector<autofill::PasswordForm>& password_exception_list) = 0;
 };
 
-}  // namespace passwords_ui
-
-#endif  // CHROME_BROWSER_UI_PASSWORD_PASSWORD_UI_VIEW_H_
+#endif  // CHROME_BROWSER_UI_PASSWORDS_PASSWORD_UI_VIEW_H_