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

chrome/browser/autofill/personal_data_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/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 216 matching lines @@
 
   if (imported_credit_card_.get()) {
     imported_credit_card_->set_label(ASCIIToUTF16(kUnlabeled));
 
     std::vector<CreditCard> credit_cards;
     credit_cards.push_back(*imported_credit_card_);
     SetCreditCards(&credit_cards);
   }
 }
 
-void PersonalDataManager::GetImportedFormData(AutoFillProfile** profile,
-                                              CreditCard** credit_card) {
-  DCHECK(profile);
-  DCHECK(credit_card);
-
-  if (imported_profile_.get()) {
-    imported_profile_->set_label(ASCIIToUTF16(kUnlabeled));
-  }
-  *profile = imported_profile_.get();
-
-  if (imported_credit_card_.get()) {
-    imported_credit_card_->set_label(ASCIIToUTF16(kUnlabeled));
-  }
-  *credit_card = imported_credit_card_.get();
-}
-
 void PersonalDataManager::SetProfiles(std::vector<AutoFillProfile>* profiles) {
   if (profile_->IsOffTheRecord())
     return;
 
   SetUniqueProfileLabels(profiles);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
@@ skipping 402 matching lines @@
     // Start at the second element because the first label should not be
     // renamed.  The appended label number starts at 2, because the first label
     // has an implicit index of 1.
     for (size_t i = 1; i < iter->second.size(); ++i) {
       string16 newlabel = iter->second[i]->Label() +
           UintToString16(static_cast<unsigned int>(i + 1));
       iter->second[i]->set_label(newlabel);
     }
   }
 }