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

chrome/browser/ui/webui/options/password_manager_handler.h

Index: chrome/browser/ui/webui/options/password_manager_handler.h
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h
index 9c65ac528a43239240cc2663932e6f0353778557..49b8abed5afdfba6a8d8ce5046de06a4b7353d15 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.h
+++ b/chrome/browser/ui/webui/options/password_manager_handler.h
@@ -9,15 +9,15 @@
 #include <vector>
 
 #include "base/prefs/pref_member.h"
-#include "chrome/browser/ui/password/password_ui_view.h"
+#include "chrome/browser/ui/passwords/password_manager_presenter.h"
+#include "chrome/browser/ui/passwords/password_ui_view.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
-#include "chrome/browser/ui/webui/options/password_manager_presenter.h"
 
 namespace options {
 
 // The WebUI based PasswordUIView. Displays passwords in the web ui.
 class PasswordManagerHandler : public OptionsPageUIHandler,
-                               public passwords_ui::PasswordUIView {
+                               public PasswordUIView {
  public:
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
@@ -59,7 +59,7 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
   std::string languages_;
 
   // The PasswordManagerPresenter object owned by the this view.
-  options::PasswordManagerPresenter password_manager_presenter_;
+  PasswordManagerPresenter password_manager_presenter_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };