Clean Obsolete HTTP Data from the Password Store

chrome/browser/password_manager/chrome_password_manager_client.cc

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 118b61b84f0f3d07f4e6a863f9dadca8e6728dd8..8e6e0c2ce878086508a6574d32eaa1a00a29839d 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -16,6 +16,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
+#include "chrome/browser/password_manager/password_manager_util.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/profiles/profile.h"
@@ -60,8 +61,6 @@
 #include "extensions/features/features.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
-#include "net/http/transport_security_state.h"
-#include "net/url_request/url_request_context.h"
 #include "third_party/re2/src/re2/re2.h"
 
 #if defined(OS_ANDROID)
@@ -227,18 +226,7 @@ bool ChromePasswordManagerClient::IsFillingEnabledForCurrentPage() const {
 
 bool ChromePasswordManagerClient::IsHSTSActiveForHost(
     const GURL& origin) const {
-  if (!origin.is_valid())
-    return false;
-
-  net::TransportSecurityState* security_state =
-      profile_->GetRequestContext()
-          ->GetURLRequestContext()
-          ->transport_security_state();
-
-  if (!security_state)
-    return false;
-
-  return security_state->ShouldUpgradeToSSL(origin.host());
+  return password_manager_util::IsHSTSActiveForProfileAndHost(profile_, origin);
 }
 
 bool ChromePasswordManagerClient::OnCredentialManagerUsed() {