Hide password saving UI for automated tests.

chrome/browser/password_manager/chrome_password_manager_client.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/password_manager/chrome_password_manager_client.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 190 matching lines @@
         log_manager_.get());
     logger.LogBoolean(
         Logger::STRING_PASSWORD_MANAGEMENT_ENABLED_FOR_CURRENT_PAGE,
         is_enabled);
   }
   return is_enabled;
 }
 
 bool ChromePasswordManagerClient::IsSavingAndFillingEnabledForCurrentPage()
     const {
-  // TODO(melandory): remove saving_and_filling_passwords_enabled_ check from
-  // here once we decide to switch to new settings behavior for everyone.
-  return *saving_and_filling_passwords_enabled_ && !IsOffTheRecord() &&
-         IsFillingEnabledForCurrentPage();

[samuong, 2017/03/03 00:03:05]

I didn't want to add the HasSwitch check to this very long && statement, and for
consistency I converted it into a series of if statements. Let me know if you
disagree.

[vabr (Chromium), 2017/03/04 20:00:20]

Adding the test for kEnableAutomation as a separate block before the current
return statement sounds good. But please keep the rest (lines 211-214 in the
original file) as is, there is no need to split that. It will also make git
history/blame easier to follow.

[samuong, 2017/03/06 18:32:01]

Done.

+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableAutomation)) {
+    // Disable the password saving UI for automated tests. It obscures the
+    // page, and there is no API to access (or dismiss) UI bubbles/infobars.
+    return false;
+  }
+  if (!*saving_and_filling_passwords_enabled_) {
+    // TODO(melandory): remove saving_and_filling_passwords_enabled_ check from
+    // here once we decide to switch to new settings behavior for everyone.
+    return false;
+  }
+  if (IsOffTheRecord())
+    return false;
+  return IsFillingEnabledForCurrentPage();
 }
 
 bool ChromePasswordManagerClient::IsFillingEnabledForCurrentPage() const {
   return !DidLastPageLoadEncounterSSLErrors() &&
          IsPasswordManagementEnabledForCurrentPage();
 }
 
 bool ChromePasswordManagerClient::IsHSTSActiveForHost(
     const GURL& origin) const {
   if (!origin.is_valid())
@@ skipping 445 matching lines @@
 // static
 bool ChromePasswordManagerClient::CanShowBubbleOnURL(const GURL& url) {
   std::string scheme = url.scheme();
   return (content::ChildProcessSecurityPolicy::GetInstance()->IsWebSafeScheme(
               scheme) &&
 #if BUILDFLAG(ENABLE_EXTENSIONS)
           scheme != extensions::kExtensionScheme &&
 #endif
           scheme != content::kChromeDevToolsScheme);
 }