DOMUI: Gracefully a handle a NULL profile in the Autofill editor handler. This

chrome/browser/dom_ui/options/autofill_options_handler.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/dom_ui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
@@ skipping 223 matching lines @@
 void AutoFillOptionsHandler::LoadAddressEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   AutoFillProfile* profile = personal_data_->GetProfileByGUID(guid);
-  DCHECK(profile);
+  if (!profile) {
+    // There is a race where a user can click once on the close button and
+    // quickly click again on the list item before the item is removed (since
+    // the list is not updated until the model tells the list an item has been
+    // removed). This will activate the editor for a profile that has been
+    // removed. Do nothing in that case.
+    return;
+  }
 
   // TODO(jhawkins): This is hacky because we can't send DictionaryValue
   // directly to CallJavascriptFunction().
   ListValue addressList;
   DictionaryValue* address = new DictionaryValue();
   address->SetString("guid", profile->guid());
   address->SetString("fullName",
                      profile->GetFieldText(AutoFillType(NAME_FULL)));
   address->SetString("companyName",
                      profile->GetFieldText(AutoFillType(COMPANY_NAME)));
@@ skipping 26 matching lines @@
 void AutoFillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   CreditCard* credit_card = personal_data_->GetCreditCardByGUID(guid);
-  DCHECK(credit_card);
+  if (!credit_card) {
+    // There is a race where a user can click once on the close button and
+    // quickly click again on the list item before the item is removed (since
+    // the list is not updated until the model tells the list an item has been
+    // removed). This will activate the editor for a profile that has been
+    // removed. Do nothing in that case.
+    return;
+  }
 
   // TODO(jhawkins): This is hacky because we can't send DictionaryValue
   // directly to CallJavascriptFunction().
   ListValue credit_card_list;
   DictionaryValue* credit_card_data = new DictionaryValue();
   credit_card_data->SetString("guid", credit_card->guid());
   credit_card_data->SetString(
       "nameOnCard",
       credit_card->GetFieldText(AutoFillType(CREDIT_CARD_NAME)));
   credit_card_data->SetString(
@@ skipping 77 matching lines @@
   if (args->GetString(4, &value))
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), value);
 
   if (!guid::IsValidGUID(credit_card.guid())) {
     credit_card.set_guid(guid::GenerateGUID());
     personal_data_->AddCreditCard(credit_card);
   } else {
     personal_data_->UpdateCreditCard(credit_card);
   }
 }