Revert 46424 - AutoFill profile shouldn't be saved when cancelled during init...

chrome/browser/autofill/autofill_manager.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/autofill/autofill_manager.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
@@ skipping 30 matching lines @@
       infobar_(NULL) {
   DCHECK(tab_contents);
 
   // |personal_data_| is NULL when using TestTabContents.
   personal_data_ =
       tab_contents_->profile()->GetOriginalProfile()->GetPersonalDataManager();
   download_manager_.SetObserver(this);
 }
 
 AutoFillManager::~AutoFillManager() {
+  // This is NULL in the MockAutoFillManager.
+  if (personal_data_)
+    personal_data_->RemoveObserver(this);
   download_manager_.SetObserver(NULL);
 }
 
 // static
 void AutoFillManager::RegisterBrowserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kAutoFillDialogPlacement);
 }
 
 // static
 void AutoFillManager::RegisterUserPrefs(PrefService* prefs) {
@@ skipping 193 matching lines @@
           break;
         }
       }
     }
   }
 
   host->AutoFillFormDataFilled(query_id, result);
   return true;
 }
 
+void AutoFillManager::OnPersonalDataLoaded() {
+  // We might have been alerted that the PersonalDataManager has loaded, so
+  // remove ourselves as observer.
+  personal_data_->RemoveObserver(this);
+
+#if !defined(OS_WIN)
+#if defined(OS_MACOSX)
+  ShowAutoFillDialog(personal_data_,
+                     personal_data_->web_profiles(),
+                     personal_data_->credit_cards(),
+                     tab_contents_->profile()->GetOriginalProfile());
+#else  // defined(OS_MACOSX)
+  ShowAutoFillDialog(NULL, personal_data_,
+                     tab_contents_->profile()->GetOriginalProfile());
+#endif  // defined(OS_MACOSX)
+#endif  // !defined(OS_WIN)
+}
+
 void AutoFillManager::OnInfoBarClosed() {
   PrefService* prefs = tab_contents_->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kAutoFillEnabled, true);
 
   // Save the imported form data as a profile.
   personal_data_->SaveImportedFormData();
 }
 
 void AutoFillManager::OnInfoBarAccepted() {
   PrefService* prefs = tab_contents_->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kAutoFillEnabled, true);
 
   // This is the first time the user is interacting with AutoFill, so set the
-  // uploaded form structure as the initial profile and credit card in the
-  // AutoFillDialog.
-  AutoFillProfile* profile = NULL;
-  CreditCard* credit_card = NULL;
-  // TODO(dhollowa) Now that we aren't immediately saving the imported form
-  // data, we should store the profile and CC in the AFM instead of the PDM.
-  personal_data_->GetImportedFormData(&profile, &credit_card);
-  ShowAutoFillDialog(tab_contents_->GetContentNativeView(),
-                     personal_data_,
-                     tab_contents_->profile()->GetOriginalProfile(),
-                     profile,
-                     credit_card);
+  // uploaded form structure as the initial profile in the AutoFillDialog.
+  personal_data_->SaveImportedFormData();
+
+#if defined(OS_WIN)
+  ShowAutoFillDialog(tab_contents_->GetContentNativeView(), personal_data_,
+                     tab_contents_->profile()->GetOriginalProfile());
+#else
+  // If the personal data manager has not loaded the data yet, set ourselves as
+  // its observer so that we can listen for the OnPersonalDataLoaded signal.
+  if (!personal_data_->IsDataLoaded())
+    personal_data_->SetObserver(this);
+  else
+    OnPersonalDataLoaded();
+#endif
 }
 
 void AutoFillManager::OnInfoBarCancelled() {
   PrefService* prefs = tab_contents_->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kAutoFillEnabled, false);
 }
 
 void AutoFillManager::Reset() {
   upload_form_structure_.reset();
   form_structures_.reset();
@@ skipping 203 matching lines @@
     // The value of the stored data for this field type in the |credit_card|.
     string16 creditcard_field_value =
         credit_card->GetFieldText(AutoFillType(type));
     if (!creditcard_field_value.empty() &&
         StartsWith(creditcard_field_value, field.value(), false)) {
       values->push_back(credit_card->ObfuscatedNumber());
       labels->push_back(credit_card->Label());
     }
   }
 }