Remove Finch kill switch for PSL matching

components/password_manager/core/browser/psl_matching_helper.cc

Index: components/password_manager/core/browser/psl_matching_helper.cc
diff --git a/components/password_manager/core/browser/psl_matching_helper.cc b/components/password_manager/core/browser/psl_matching_helper.cc
index 484ca180c9dcedb7fd4927dab50857d201ce7b05..69244fa7923f3f979d136f3a56422a70fc554f09 100644
--- a/components/password_manager/core/browser/psl_matching_helper.cc
+++ b/components/password_manager/core/browser/psl_matching_helper.cc
@@ -7,7 +7,6 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/metrics/field_trial.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -17,33 +16,13 @@ using autofill::PasswordForm;
 
 namespace password_manager {
 
-#if !defined(OS_IOS)
-namespace {
-
-const char kPSLMatchingDesktopFieldTrialName[] = "PSLMatchingDesktop";
-const char kPSLMatchingDesktopFieldTrialDisabledGroupName[] = "Disabled";
-
-}  // namespace
-#endif
-
-bool PSLMatchingHelper::psl_enabled_override_ = false;
-
-PSLMatchingHelper::PSLMatchingHelper() : psl_enabled_(DeterminePSLEnabled()) {}
-
-PSLMatchingHelper::~PSLMatchingHelper() {}
-
-bool PSLMatchingHelper::IsMatchingEnabled() const {
-  return psl_enabled_override_ || psl_enabled_;
+bool ShouldPSLDomainMatchingApply(
+    const std::string& registry_controlled_domain) {
+  return registry_controlled_domain != "google.com";
 }
 
-bool PSLMatchingHelper::ShouldPSLDomainMatchingApply(
-    const std::string& registry_controlled_domain) const {
-  return IsMatchingEnabled() && registry_controlled_domain != "google.com";
-}
-
-// static
-bool PSLMatchingHelper::IsPublicSuffixDomainMatch(const std::string& url1,
-                                                  const std::string& url2) {
+bool IsPublicSuffixDomainMatch(const std::string& url1,
+                               const std::string& url2) {
   GURL gurl1(url1);
   GURL gurl2(url2);
 
@@ -56,29 +35,10 @@ bool PSLMatchingHelper::IsPublicSuffixDomainMatch(const std::string& url1,
          gurl1.port() == gurl2.port();
 }
 
-// static
-std::string PSLMatchingHelper::GetRegistryControlledDomain(
-    const GURL& signon_realm) {
+std::string GetRegistryControlledDomain(const GURL& signon_realm) {
   return net::registry_controlled_domains::GetDomainAndRegistry(
       signon_realm,
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
-// static
-void PSLMatchingHelper::EnablePublicSuffixDomainMatchingForTesting() {
-  psl_enabled_override_ = true;
-}
-
-// static
-bool PSLMatchingHelper::DeterminePSLEnabled() {
-  bool enabled = true;
-#if !defined(OS_IOS)
-  if (base::FieldTrialList::FindFullName(kPSLMatchingDesktopFieldTrialName) ==
-      kPSLMatchingDesktopFieldTrialDisabledGroupName) {
-    enabled = false;
-  }
-#endif
-  return enabled;
-}
-
 }  // namespace password_manager