Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES.

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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/passwords/manage_passwords_ui_controller.h"
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
@@ skipping 104 matching lines @@
   timer_.reset(new base::ElapsedTimer);
   base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
   UpdateBubbleAndIconVisibility();
 }
 
 bool ManagePasswordsUIController::OnChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_credentials,
     ScopedVector<autofill::PasswordForm> federated_credentials,
     const GURL& origin,
     base::Callback<void(const password_manager::CredentialInfo&)> callback) {
-  DCHECK_IMPLIES(local_credentials.empty(), !federated_credentials.empty());
+  DCHECK(!local_credentials.empty() || !federated_credentials.empty());
   passwords_data_.OnRequestCredentials(local_credentials.Pass(),
                                        federated_credentials.Pass(),
                                        origin);
   base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
 #if defined(OS_ANDROID)
   UpdateAndroidAccountChooserInfoBarVisibility();
 #else
   UpdateBubbleAndIconVisibility();
 #endif
   if (!should_pop_up_bubble_) {
@@ skipping 275 matching lines @@
   return state() == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE &&
          GetCurrentForms().size() > 1 && !PasswordOverridden();
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }