Remove passwords from the keychain if profile is destroyed.

BUG=343891

Review URL: https://codereview.chromium.org/307673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274205 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/profiles/profile_manager.cc

@@ -25,6 +25,7 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ -47,6 +48,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/password_manager/core/browser/password_store.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -1090,6 +1092,15 @@ void ProfileManager::FinishDeletingProfile(const base::FilePath& profile_dir) {
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           profile)->DisableForUser();
     }
+
+    // Some platforms store passwords in keychains. They should be removed.
+    scoped_refptr<password_manager::PasswordStore> password_store =
+        PasswordStoreFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS)
+            .get();
+    if (password_store) {
+      password_store->RemoveLoginsCreatedBetween(base::Time(),
+                                                 base::Time::Max());
+    }
   }
 
   QueueProfileDirectoryForDeletion(profile_dir);

chrome/browser/profiles/profile_manager_browsertest.cc

@@ -6,6 +6,7 @@
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -20,6 +21,9 @@
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/autofill/core/common/password_form.h"
+#include "components/password_manager/core/browser/password_store.h"
+#include "components/password_manager/core/browser/password_store_consumer.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/path_service.h"
@@ -85,6 +89,29 @@ class ProfileRemovalObserver : public ProfileInfoCacheObserver {
   DISALLOW_COPY_AND_ASSIGN(ProfileRemovalObserver);
 };
 
+class PasswordStoreConsumerVerifier :
+    public password_manager::PasswordStoreConsumer {
+ public:
+  PasswordStoreConsumerVerifier() : called_(false) {}
+
+  virtual void OnGetPasswordStoreResults(
+      const std::vector<autofill::PasswordForm*>& results) OVERRIDE {
+    EXPECT_FALSE(called_);
+    called_ = true;
+    password_entries_.clear();
+    password_entries_.assign(results.begin(), results.end());
+  }
+
+  bool IsCalled() const { return called_; }
+
+  const std::vector<autofill::PasswordForm*>& GetPasswords() const {
+    return password_entries_.get();
+  }
+ private:
+  ScopedVector<autofill::PasswordForm> password_entries_;
+  bool called_;
+};
+
 } // namespace
 
 // This file contains tests for the ProfileManager that require a heavyweight
@@ -368,3 +395,49 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, EphemeralProfile) {
   EXPECT_EQ(1U, browser_list->size());
   ASSERT_EQ(1U, cache.GetNumberOfProfiles());
 }
+
+IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DeletePasswords) {
+  Profile* profile = ProfileManager::GetActiveUserProfile();
+  ASSERT_TRUE(profile);
+
+  autofill::PasswordForm form;
+  form.scheme = autofill::PasswordForm::SCHEME_HTML;
+  form.origin = GURL("http://accounts.google.com/LoginAuth");
+  form.signon_realm = "http://accounts.google.com/";
+  form.username_value = base::ASCIIToUTF16("my_username");
+  form.password_value = base::ASCIIToUTF16("my_password");
+  form.ssl_valid = false;
+  form.preferred = true;
+  form.blacklisted_by_user = false;
+
+  scoped_refptr<password_manager::PasswordStore> password_store =
+      PasswordStoreFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS)
+          .get();
+  ASSERT_TRUE(password_store);
+
+  password_store->AddLogin(form);
+  PasswordStoreConsumerVerifier verify_add;
+  password_store->GetAutofillableLogins(&verify_add);
+
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  profile_manager->ScheduleProfileForDeletion(profile->GetPath(),
+                                              ProfileManager::CreateCallback());
+  content::RunAllPendingInMessageLoop();
+  PasswordStoreConsumerVerifier verify_delete;
+  password_store->GetAutofillableLogins(&verify_delete);
+
+  // Run the password background thread.
+  base::RunLoop run_loop;
+  base::Closure task = base::Bind(
+      base::IgnoreResult(&content::BrowserThread::PostTask),
+      content::BrowserThread::UI,
+      FROM_HERE,
+      run_loop.QuitClosure());
+  EXPECT_TRUE(password_store->ScheduleTask(task));
+  run_loop.Run();
+
+  EXPECT_TRUE(verify_add.IsCalled());
+  EXPECT_EQ(1u, verify_add.GetPasswords().size());
+  EXPECT_TRUE(verify_delete.IsCalled());
+  EXPECT_EQ(0u, verify_delete.GetPasswords().size());
+}