Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_bubble_model.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_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_MODEL_H_
 
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 77 matching lines @@
                            password_manager::CredentialType credential_type_);
 
   GURL origin() const { return origin_; }
 
   password_manager::ui::State state() const { return state_; }
 
   const base::string16& title() const { return title_; }
   const autofill::PasswordForm& pending_password() const {
     return pending_password_;
   }
-  const autofill::ConstPasswordFormMap& best_matches() const {
-    return best_matches_;
+  const ScopedVector<const autofill::PasswordForm>& local_credentials() const {

[groby-ooo-7-16, 2015/03/16 22:03:17]

Please add a comment what "local_credentials" and "federated_credentials" are -
I'm not sure I follow why it's OK to fold best_matches_ into local_credentials_

[vasilii, 2015/03/17 10:49:48]

Done.

+    return local_credentials_;
   }
-  const ScopedVector<autofill::PasswordForm>& local_pending_credentials()
+  const ScopedVector<const autofill::PasswordForm>& federated_credentials()
       const {
-    return local_pending_credentials_;
-  }
-  const ScopedVector<autofill::PasswordForm>& federated_pending_credentials()
-      const {
-    return federated_pending_credentials_;
+    return federated_credentials_;
   }
   const base::string16& manage_link() const { return manage_link_; }
   bool never_save_passwords() const { return never_save_passwords_; }
   const base::string16& save_confirmation_text() const {
     return save_confirmation_text_;
   }
   const gfx::Range& save_confirmation_link_range() const {
     return save_confirmation_link_range_;
   }
 
   Profile* GetProfile() const;
 
 #if defined(UNIT_TEST)
   // Gets and sets the reason the bubble was displayed.
   password_manager::metrics_util::UIDisplayDisposition display_disposition()
       const {
     return display_disposition_;
   }
 
   // Gets the reason the bubble was dismissed.
   password_manager::metrics_util::UIDismissalReason dismissal_reason() const {
     return dismissal_reason_;
   }
 
   // State setter.
   void set_state(password_manager::ui::State state) { state_ = state; }
 #endif
 
-// Upper limits on the size of the username and password fields.
+  // Upper limits on the size of the username and password fields.
   static int UsernameFieldWidth();
   static int PasswordFieldWidth();
 
  private:
   // URL of the page from where this bubble was triggered.
   GURL origin_;
   password_manager::ui::State state_;
   base::string16 title_;
   autofill::PasswordForm pending_password_;
-  autofill::ConstPasswordFormMap best_matches_;
-  ScopedVector<autofill::PasswordForm> local_pending_credentials_;
-  ScopedVector<autofill::PasswordForm> federated_pending_credentials_;
+  ScopedVector<const autofill::PasswordForm> local_credentials_;
+  ScopedVector<const autofill::PasswordForm> federated_credentials_;
   base::string16 manage_link_;
   base::string16 save_confirmation_text_;
   gfx::Range save_confirmation_link_range_;
   // If true upon destruction, the user has confirmed that she never wants to
   // save passwords for a particular site.
   bool never_save_passwords_;
   password_manager::metrics_util::UIDisplayDisposition display_disposition_;
   password_manager::metrics_util::UIDismissalReason dismissal_reason_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsBubbleModel);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_MODEL_H_