Clean Obsolete HTTP Data from the Password Store

components/password_manager/core/browser/BUILD.gn

Index: components/password_manager/core/browser/BUILD.gn
diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
index 8b4356cda8a95e92cca4890d35e3092db09afd7b..ac39fa2b5d7a8faea7231031dbcb8a32776f6763 100644
--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
@@ -52,6 +52,10 @@ static_library("browser") {
     "form_saver.h",
     "form_saver_impl.cc",
     "form_saver_impl.h",
+    "hsts_query.cc",
+    "hsts_query.h",
+    "http_data_cleaner.cc",
+    "http_data_cleaner.h",
     "http_password_store_migrator.cc",
     "http_password_store_migrator.h",
     "import/csv_reader.cc",
@@ -74,8 +78,6 @@ static_library("browser") {
     "login_database_win.cc",
     "login_model.cc",
     "login_model.h",
-    "obsolete_http_cleaner.cc",
-    "obsolete_http_cleaner.h",
     "password_autofill_manager.cc",
     "password_autofill_manager.h",
     "password_bubble_experiment.cc",
@@ -167,6 +169,15 @@ static_library("browser") {
     "//url",
   ]
 
+  if (is_ios) {
+    sources -= [

[vasilii, 2017/03/28 17:27:44]

What about if (!is_ios) sources += ?

[jdoerrie, 2017/03/29 11:27:56]

Done.

+      "hsts_query.cc",
+      "hsts_query.h",
+      "http_data_cleaner.cc",
+      "http_data_cleaner.h",
+    ]
+  }
+
   if (is_mac || is_ios) {
     sources -= [ "login_database_posix.cc" ]
   }
@@ -223,6 +234,7 @@ static_library("test_support") {
   deps = [
     "//base",
     "//components/autofill/core/common",
+    "//net:net",
     "//testing/gtest",
   ]
 }
@@ -280,6 +292,8 @@ source_set("unit_tests") {
     "facet_manager_unittest.cc",
     "form_fetcher_impl_unittest.cc",
     "form_saver_impl_unittest.cc",
+    "hsts_query_unittest.cc",
+    "http_data_cleaner_unittest.cc",
     "http_password_store_migrator_unittest.cc",
     "import/csv_reader_unittest.cc",
     "import/password_csv_reader_unittest.cc",
@@ -288,7 +302,6 @@ source_set("unit_tests") {
     "log_router_unittest.cc",
     "login_database_unittest.cc",
     "login_model_unittest.cc",
-    "obsolete_http_cleaner_unittest.cc",
     "password_autofill_manager_unittest.cc",
     "password_bubble_experiment_unittest.cc",
     "password_form_manager_unittest.cc",
@@ -312,6 +325,10 @@ source_set("unit_tests") {
   }
   if (is_ios) {
     sources += [ "login_database_ios_unittest.cc" ]
+    sources -= [
+      "hsts_query_unittest.cc",
+      "http_data_cleaner_unittest.cc",
+    ]
   }
   deps = [
     ":test_support",