Clear wallet data from autofill when disabled.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 1320 matching lines @@
     std::map<std::string, int>::iterator iter =
         std::max_element(votes.begin(), votes.end(), CompareVotes);
     return iter->first;
   }
 
   return std::string();
 }
 
 void PersonalDataManager::EnabledPrefChanged() {
   default_country_code_.clear();
+  if (!pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled) &&
+      !server_credit_cards_.empty()) {

[Evan Stade, 2015/03/17 01:26:53]

the server_credit_cards_.empty() check seems unnecessary

+    // Re-mask all server cards when the user turns off wallet card
+    // integration.
+    ResetFullServerCards();
+  }
   NotifyPersonalDataChanged();
 }
 
 const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles(
     bool record_metrics) const {
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   bool use_auxiliary_profiles =
       pref_service_->GetBoolean(prefs::kAutofillUseMacAddressBook);
 #else
   bool use_auxiliary_profiles =
@@ skipping 11 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill