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

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 771478c9ec6088639c2dcf65e7272f5843020869..5db35887b819f74f2f857519e25bda62ca478c1b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1665,6 +1665,7 @@
         'browser/ui/omnibox/omnibox_view_unittest.cc',
         'browser/ui/panels/display_settings_provider_win_unittest.cc',
         'browser/ui/panels/panel_mouse_watcher_unittest.cc',
+        'browser/ui/passwords/password_manager_presenter_unittest.cc',
         'browser/ui/search_engines/keyword_editor_controller_unittest.cc',
         'browser/ui/search/instant_ntp_prerenderer_unittest.cc',
         'browser/ui/search/instant_page_unittest.cc',
@@ -1739,7 +1740,6 @@
         'browser/ui/webui/ntp/suggestions_combiner_unittest.cc',
         'browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc',
         'browser/ui/webui/options/language_options_handler_unittest.cc',
-        'browser/ui/webui/options/password_manager_presenter_unittest.cc',
         'browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc',
         'browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc',
         'browser/ui/webui/print_preview/print_preview_ui_unittest.cc',