Landing r60095 to the M7 branch....

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 <limits>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 420 matching lines @@
   std::vector<FormStructure*> import;
   import.push_back(upload_form_structure_.get());
   if (!personal_data_->ImportFormData(import, this))
     return;
 
   // Did we get credit card info?
   AutoFillProfile* profile;
   CreditCard* credit_card;
   personal_data_->GetImportedFormData(&profile, &credit_card);
 
-  if (credit_card) {
-    cc_infobar_.reset(new AutoFillCCInfoBarDelegate(tab_contents_, this));
-  } else {
+  if (!credit_card) {
     UploadFormData();
+    return;
+  }
+
+  // Show an infobar to offer to save the credit card info.
+  if (tab_contents_) {
+    tab_contents_->AddInfoBar(new AutoFillCCInfoBarDelegate(tab_contents_,
+                                                            this));
   }
 }
 
 void AutoFillManager::UploadFormData() {
   if (!disable_download_manager_requests_ && upload_form_structure_.get()) {
     bool was_autofilled = false;
     // Check if the form among last 3 forms that were auto-filled.
     // Clear older signatures.
     std::list<std::string>::iterator it;
     int total_form_checked = 0;
@@ skipping 349 matching lines @@
 
 // When receiving IDs (across processes) from the renderer we unpack credit card
 // and profile IDs from a single integer.  Credit card IDs are stored in the
 // high word and profile IDs are stored in the low word.
 // static
 void AutoFillManager::UnpackIDs(int id, int* cc_id, int* profile_id) {
   *cc_id = id >> std::numeric_limits<unsigned short>::digits &
       std::numeric_limits<unsigned short>::max();
   *profile_id = id & std::numeric_limits<unsigned short>::max();
 }