| Index: chrome/browser/password_manager/chrome_password_manager_client.cc
|
| diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
|
| index 3aa46f59cf73d72232666391514f81825f31b086..b68172cf473b53e75b853f52e1dc4b678af890e2 100644
|
| --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
|
| +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
|
| @@ -46,7 +46,6 @@
|
| #include "components/password_manager/core/common/credential_manager_types.h"
|
| #include "components/password_manager/core/common/password_manager_features.h"
|
| #include "components/password_manager/core/common/password_manager_pref_names.h"
|
| -#include "components/password_manager/core/common/password_manager_switches.h"
|
| #include "components/password_manager/sync/browser/password_sync_util.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
| @@ -181,7 +180,8 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage()
|
| if (!entry) {
|
| // TODO(gcasto): Determine if fix for crbug.com/388246 is relevant here.
|
| is_enabled = true;
|
| - } else if (EnabledForSyncSignin()) {
|
| + } else if (base::FeatureList::IsEnabled(
|
| + password_manager::features::kManagerForSyncSignin)) {
|
| is_enabled = true;
|
| } else {
|
| // Do not fill nor save password when a user is signing in for sync. This
|
| @@ -599,22 +599,6 @@ bool ChromePasswordManagerClient::IsUpdatePasswordUIEnabled() const {
|
| #endif
|
| }
|
|
|
| -bool ChromePasswordManagerClient::EnabledForSyncSignin() {
|
| - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| - if (command_line->HasSwitch(
|
| - password_manager::switches::kDisableManagerForSyncSignin))
|
| - return false;
|
| -
|
| - if (command_line->HasSwitch(
|
| - password_manager::switches::kEnableManagerForSyncSignin))
|
| - return true;
|
| -
|
| - // Default is enabled.
|
| - std::string group_name =
|
| - base::FieldTrialList::FindFullName("PasswordManagerStateForSyncSignin");
|
| - return group_name != "Disabled";
|
| -}
|
| -
|
| const GURL& ChromePasswordManagerClient::GetMainFrameURL() const {
|
| return web_contents()->GetVisibleURL();
|
| }
|
|
|