Change PasswordStoreDefault to access the WebDataService from the UI thread o...

chrome/browser/password_manager/password_store_win.cc

 // Copyright (c) 2009 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_win.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profile.h"
 
 using std::map;
 using std::vector;
 
 PasswordStoreWin::PasswordStoreWin(WebDataService* web_data_service)
     : PasswordStoreDefault(web_data_service) {
 }
 
 void PasswordStoreWin::OnWebDataServiceRequestDone(
     WebDataService::Handle h, const WDTypedResult *result) {
   // Look up this handle in our request map to get the original
   // GetLoginsRequest.
-  GetLoginsRequest* request = GetLoginsRequestForWebDataServiceRequest(h);
-  DCHECK(request);
-  // Remove our pending request, but make sure that we won't be destroyed until
-  // we're done with this function.
-  scoped_refptr<PasswordStoreWin> life_preserver(this);
-  RemovePendingWebDataServiceRequest(h);
+  PendingRequestMap::iterator it(pending_requests_.find(h));
+  // If the request was cancelled, we are done.
+  if (it == pending_requests_.end())
+    return;
+
+  scoped_ptr<GetLoginsRequest> request(it->second);
+  pending_requests_.erase(it);
 
   DCHECK(result);
   if (!result)
     return;
 
   switch (result->GetType()) {
     case PASSWORD_RESULT: {
       // This is a response from WebDataService::GetLogins.
       const WDResult<std::vector<PasswordForm*> >* r =
         static_cast<const WDResult<std::vector<PasswordForm*> >*>(result);
       std::vector<PasswordForm*> result_value = r->GetValue();
 
       if (result_value.size()) {
         // If we found some results then return them now.
-        NotifyConsumer(request, result_value);
+        request->consumer->OnPasswordStoreRequestDone(request->handle,
+                                                      result_value);
         return;
       } else {
         // Otherwise try finding IE7 logins.
         IE7PasswordInfo info;
         std::wstring url = ASCIIToWide(request->form.origin.spec());
         info.url_hash = ie7_password::GetUrlHash(url);
 
         if (web_data_service_->IsRunning()) {
           WebDataService::Handle web_data_handle =
               web_data_service_->GetIE7Login(info, this);
-          AddPendingWebDataServiceRequest(web_data_handle, request);
+          pending_requests_.insert(PendingRequestMap::value_type(
+              web_data_handle, request.release()));
         }
       }
       break;
     }
 
     case PASSWORD_IE7_RESULT: {
       // This is a response from WebDataService::GetIE7Login.
       PasswordForm* ie7_form = GetIE7Result(result, request->form);
 
       std::vector<PasswordForm*> forms;
       if (ie7_form)
         forms.push_back(ie7_form);
 
-      NotifyConsumer(request, forms);
+      request->consumer->OnPasswordStoreRequestDone(request->handle,
+                                                    forms);
       break;
     }
   }
 }
 
 PasswordForm* PasswordStoreWin::GetIE7Result(const WDTypedResult *result,
                                              const PasswordForm& form) {
   const WDResult<IE7PasswordInfo>* r =
     static_cast<const WDResult<IE7PasswordInfo>*>(result);
   IE7PasswordInfo info = r->GetValue();
@@ skipping 16 matching lines @@
     auto_fill->password_value = password;
     auto_fill->preferred = true;
     auto_fill->ssl_valid = form.origin.SchemeIsSecure();
     auto_fill->date_created = info.date_created;
     // Add this PasswordForm to the saved password table.
     AddLogin(*auto_fill);
     return auto_fill;
   }
   return NULL;
 }