Autofill OSX: Replace AutofillPopUpButton with NSPopUpButton.

chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

Index: chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
diff --git a/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm b/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
index 542441543c31948a3d4a532c86957d4ec2d8d132..dfbaf3bd74aa300493211b79b4baa94574b88275 100644
--- a/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
+++ b/chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm
@@ -6,7 +6,6 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h"
-#import "chrome/browser/ui/cocoa/autofill/autofill_pop_up_button.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
@@ -87,15 +86,13 @@ void CardUnmaskPromptViewBridge::PerformClose() {
 
 @implementation CardUnmaskPromptViewCocoa
 
-+ (AutofillPopUpButton*)buildDatePopupWithModel:(ui::ComboboxModel&)model {
-  AutofillPopUpButton* popup =
-      [[AutofillPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO];
++ (NSPopUpButton*)buildDatePopupWithModel:(ui::ComboboxModel&)model {
+  NSPopUpButton* popup =
+      [[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO];
 
   for (int i = 0; i < model.GetItemCount(); ++i) {
     [popup addItemWithTitle:base::SysUTF16ToNSString(model.GetItemAt(i))];
   }
-  [popup setDefaultValue:base::SysUTF16ToNSString(
-                             model.GetItemAt(model.GetDefaultIndex()))];

[bondd, 2015/03/05 23:51:06]

defaultValue is not currently used so it's safe to remove this.

   [popup sizeToFit];
   return popup;
 }
@@ -179,13 +176,13 @@ void CardUnmaskPromptViewBridge::PerformClose() {
 
     // Month.
     autofill::MonthComboboxModel monthModel;
-    base::scoped_nsobject<AutofillPopUpButton> monthPopup(
+    base::scoped_nsobject<NSPopUpButton> monthPopup(
         [CardUnmaskPromptViewCocoa buildDatePopupWithModel:monthModel]);
     [expirationView addSubview:monthPopup];
 
     // Year.
     autofill::YearComboboxModel yearModel;
-    base::scoped_nsobject<AutofillPopUpButton> yearPopup(
+    base::scoped_nsobject<NSPopUpButton> yearPopup(
         [CardUnmaskPromptViewCocoa buildDatePopupWithModel:yearModel]);
     [expirationView addSubview:yearPopup];