Clean password_manager::ui::State

chrome/browser/ui/views/passwords/manage_password_items_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/passwords/manage_password_items_view.h"
 
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "grit/components_strings.h"
@@ skipping 129 matching lines @@
     AddUndoRow(layout);
   } else {
     AddCredentialsRow(layout);
   }
 }
 
 void ManagePasswordItemsView::PasswordFormRow::AddCredentialsRow(
     views::GridLayout* layout) {
   ResetControls();
   int column_set_id =
-      password_manager::ui::IsPendingState(host_->model_->state())
+      host_->model_->state() == password_manager::ui::PENDING_PASSWORD_STATE
           ? TWO_COLUMN_SET
           : THREE_COLUMN_SET;
   BuildColumnSetIfNeeded(layout, column_set_id);
   layout->StartRowWithPadding(0, column_set_id, 0,
                               views::kRelatedControlVerticalSpacing);
   layout->AddView(GenerateUsernameLabel(*password_form_));
   layout->AddView(GeneratePasswordLabel(*password_form_));
   if (column_set_id == THREE_COLUMN_SET) {
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     delete_button_ = new views::ImageButton(this);
@@ skipping 80 matching lines @@
   Refresh();
   // After the view is consistent, notify the model that the password needs to
   // be updated (either removed or put back into the store, as appropriate.
   model_->OnPasswordAction(password_form,
                            deleted
                                ? ManagePasswordsBubbleModel::REMOVE_PASSWORD
                                : ManagePasswordsBubbleModel::ADD_PASSWORD);
 }
 
 void ManagePasswordItemsView::Refresh() {
-  DCHECK(!password_manager::ui::IsPendingState(model_->state()));
+  DCHECK_NE(password_manager::ui::PENDING_PASSWORD_STATE, model_->state());
   RemoveAllChildViews(true);
   AddRows();
 }