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 {
-
 // 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.
 class PasswordUIView {
  public:
   virtual ~PasswordUIView() {}
 
   // Returns the profile associated with the currently active profile.
   virtual Profile* GetProfile() = 0;
 
   // Reveals the password for the saved password entry at |index| in the UI.
   // |index| the index of the saved password entry.
   // |password_value| the value of saved password entry at |index|.
   virtual void ShowPassword(size_t index, const string16& password_value) = 0;
 
   // Updates the list of passwords in the UI.
   // |password_list| the list of saved password entries.
   // |show_passwords| true if the passwords should be shown in the UI.
   virtual void SetPasswordList(
       const ScopedVector<autofill::PasswordForm>& password_list,
       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_