Migrate web data service logins to the login database correctly on win.

chrome/browser/password_manager/password_store_default.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_change.h"
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_service.h"
@@ skipping 96 matching lines @@
   if (prefs->FindPreference(prefs::kLoginDatabaseMigrated))
     return;
   handles_.insert(web_data_service_->GetAutofillableLogins(this));
   handles_.insert(web_data_service_->GetBlacklistLogins(this));
 }
 
 typedef std::vector<const PasswordForm*> PasswordForms;
 
 void PasswordStoreDefault::OnWebDataServiceRequestDone(
     WebDataService::Handle handle,
-    const WDTypedResult *result) {
+    const WDTypedResult* result) {
   DCHECK(handles_.end() != handles_.find(handle));
   DCHECK(result);
 
+  if (PASSWORD_RESULT != result->GetType()) {
+    NOTREACHED();
+    return;
+  }
+
   handles_.erase(handle);
   if (!result)
     return;
 
   const PasswordForms& forms =
       static_cast<const WDResult<PasswordForms>*>(result)->GetValue();
   for (PasswordForms::const_iterator it = forms.begin();
        it != forms.end(); ++it) {
     AddLoginImpl(**it);
     web_data_service_->RemoveLogin(**it);
     delete *it;
   }
   if (handles_.empty()) {
     profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                               true);
   }
 }