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

chrome/browser/ui/passwords/password_ui_view.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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"
 
 namespace autofill {
 struct PasswordForm;
 }
 
 class Profile;
 
 namespace passwords_ui {
@@ skipping 21 matching lines @@
       bool show_passwords) = 0;
 
   // Updates the list of password exceptions in the UI.
   // |password_exception_list| The list of saved password exceptions.
   virtual void SetPasswordExceptionList(
       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_