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 f0dabfa3f24fbc6e3617e02fab9c7ec37b9994c1..863b29a45c404ec14830332bd152b210c3bc70bd 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" |
@@ -572,14 +571,15 @@ bool ChromePasswordManagerClient::IsUpdatePasswordUIEnabled() const { |
} |
bool ChromePasswordManagerClient::EnabledForSyncSignin() { |
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- if (command_line->HasSwitch( |
- password_manager::switches::kDisableManagerForSyncSignin)) |
+ if (password_manager_util::IsFeatureDisabledFromCommandLine( |
+ password_manager::features::kManagerForSyncSignin)) { |
Bernhard Bauer
2016/02/11 11:12:40
I don't think this is necessary; FeatureList will
Pritam Nikam
2016/02/25 14:16:06
Done.
|
return false; |
+ } |
- if (command_line->HasSwitch( |
- password_manager::switches::kEnableManagerForSyncSignin)) |
+ if (base::FeatureList::IsEnabled( |
+ password_manager::features::kManagerForSyncSignin)) { |
return true; |
+ } |
// Default is enabled. |
std::string group_name = |