Linux: delete the unencrypted login database file after a successful password migration.

chrome/browser/password_manager/password_store_x.cc

 // Copyright (c) 2010 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 "chrome/browser/password_manager/password_store_x.h"
 
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 202 matching lines @@
       }
     }
     if (ok) {
       for (size_t i = 0; i < forms.size(); ++i) {
         // If even one of these calls to RemoveLoginImpl() succeeds, then we
         // should prefer the native backend to the now-incomplete login
         // database. Thus we want to return a success status even in the case
         // where some fail. The only real problem with this is that we might
         // leave passwords in the login database and never come back to clean
         // them out if any of these calls do fail.
-        // TODO(mdm): Really we should just delete the login database file.
         PasswordStoreDefault::RemoveLoginImpl(*forms[i]);
       }
+      // Finally, delete the database file itself. We remove the passwords from
+      // it before deleting the file just in case there is some problem deleting
+      // the file (e.g. directory is not writable, but file is), which would
+      // otherwise cause passwords to re-migrate next (or maybe every) time.
+      DeleteAndRecreateDatabaseFile();
     }
   }
   ssize_t result = ok ? forms.size() : -1;
   STLDeleteElements(&forms);
   return result;
 }