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..1baaa369f9ee07357bff9f751078bd6eb0ebf1fe 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.h
+++ b/chrome/browser/ui/webui/options/password_manager_handler.h
@@ -9,9 +9,9 @@
 #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 {
 
@@ -59,7 +59,7 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
   std::string languages_;
 
   // The PasswordManagerPresenter object owned by the this view.
-  options::PasswordManagerPresenter password_manager_presenter_;
+  passwords_ui::PasswordManagerPresenter password_manager_presenter_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };