Revert "Revert 3 mac autofill CLs."

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

 // Copyright (c) 2012 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/ui/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 41 matching lines @@
 };
 
 const DataResource kDataResources[] = {
   { "americanExpressCC", IDR_AUTOFILL_CC_AMEX },
   { "dinersCC", IDR_AUTOFILL_CC_DINERS },
   { "discoverCC", IDR_AUTOFILL_CC_DISCOVER },
   { "genericCC", IDR_AUTOFILL_CC_GENERIC },
   { "jcbCC", IDR_AUTOFILL_CC_JCB },
   { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD },
   { "visaCC", IDR_AUTOFILL_CC_VISA },
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  { "macContactsIcon", IDR_AUTOFILL_MAC_CONTACTS_ICON },
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 };
 
 }  // namespace
 
 // static
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
     WeakPtr<AutofillPopupControllerImpl> previous,
     WeakPtr<AutofillPopupDelegate> delegate,
     content::WebContents* web_contents,
     gfx::NativeView container_view,
@@ skipping 550 matching lines @@
   names_.clear();
   subtexts_.clear();
   icons_.clear();
   identifiers_.clear();
   full_names_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill