[Password Manager] Switch password manager code to use the Feature framework.

components/password_manager/core/browser/password_store_factory_util.cc

 // Copyright 2015 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 "components/password_manager/core/browser/password_store_factory_util.h"
 
 #include <utility>
 
-#include "base/command_line.h"
 #include "components/password_manager/core/browser/affiliated_match_helper.h"
 #include "components/password_manager/core/browser/affiliation_service.h"
 #include "components/password_manager/core/browser/affiliation_utils.h"
 #include "components/password_manager/core/browser/password_manager_constants.h"
+#include "components/password_manager/core/common/password_manager_features.h"
 
 namespace password_manager {
 
 namespace {
 
 bool ShouldAffiliationBasedMatchingBeActive(
     sync_driver::SyncService* sync_service) {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (!IsAffiliationBasedMatchingEnabled(*command_line))
-    return false;
-
-  return sync_service && sync_service->CanSyncStart() &&
+  return base::FeatureList::IsEnabled(features::kAffiliationBasedMatching) &&
+         sync_service && sync_service->CanSyncStart() &&
          sync_service->IsSyncActive() &&
          sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS) &&
          !sync_service->IsUsingSecondaryPassphrase();
 }
 
 void ActivateAffiliationBasedMatching(
     PasswordStore* password_store,
     net::URLRequestContextGetter* request_context_getter,
     const base::FilePath& db_path,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner) {
   // The PasswordStore is so far the only consumer of the AffiliationService,
   // therefore the service is owned by the AffiliatedMatchHelper, which in
   // turn is owned by the PasswordStore.
   scoped_ptr<AffiliationService> affiliation_service(
       new AffiliationService(db_thread_runner));
   affiliation_service->Initialize(request_context_getter, db_path);
   scoped_ptr<AffiliatedMatchHelper> affiliated_match_helper(
       new AffiliatedMatchHelper(password_store,
                                 std::move(affiliation_service)));
   affiliated_match_helper->Initialize();
   password_store->SetAffiliatedMatchHelper(std::move(affiliated_match_helper));
 
   password_store->enable_propagating_password_changes_to_web_credentials(
-      IsPropagatingPasswordChangesToWebCredentialsEnabled(
-          *base::CommandLine::ForCurrentProcess()));
+      base::FeatureList::IsEnabled(features::kAffiliationBasedMatching));
 }
 
 base::FilePath GetAffiliationDatabasePath(const base::FilePath& profile_path) {
   return profile_path.Append(kAffiliationDatabaseFileName);
 }
 
 }  // namespace
 
 void ToggleAffiliationBasedMatchingBasedOnPasswordSyncedState(
     PasswordStore* password_store,
@@ skipping 30 matching lines @@
   }
 }
 
 scoped_ptr<LoginDatabase> CreateLoginDatabase(
     const base::FilePath& profile_path) {
   base::FilePath login_db_file_path = profile_path.Append(kLoginDataFileName);
   return make_scoped_ptr(new LoginDatabase(login_db_file_path));
 }
 
 }  // namespace password_manager