Remove PersonalAutofillPopulator for Android.

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 908 matching lines @@
   if (!database_.get()) {
     NOTREACHED();
     return;
   }
 
   CancelPendingQuery(&pending_profiles_query_);
 
   pending_profiles_query_ = database_->GetAutofillProfiles(this);
 }
 
-// Win, Linux, and iOS implementations do nothing. Mac and Android
-// implementations fill in the contents of |auxiliary_profiles_|.
-#if defined(OS_IOS) || (!defined(OS_MACOSX) && !defined(OS_ANDROID))
+// Win, Linux, Android and iOS implementations do nothing. Mac implementation
+// fills in the contents of |auxiliary_profiles_|.
+#if defined(OS_IOS) || !defined(OS_MACOSX)
 void PersonalDataManager::LoadAuxiliaryProfiles(bool record_metrics) const {
 }
 #endif
 
 void PersonalDataManager::LoadCreditCards() {
   if (!database_.get()) {
     NOTREACHED();
     return;
   }
 
@@ skipping 168 matching lines @@
   // Populates |auxiliary_profiles_|.
   LoadAuxiliaryProfiles(record_metrics);
 
   profiles_.insert(profiles_.end(), web_profiles_.begin(), web_profiles_.end());
   profiles_.insert(
       profiles_.end(), auxiliary_profiles_.begin(), auxiliary_profiles_.end());
   return profiles_;
 }
 
 }  // namespace autofill