Ask libaddressinput for address components to use in requestAutocomplete().

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

 // Copyright (c) 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_input_field.h"
 #import "chrome/browser/ui/cocoa/autofill/layout_view.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/simple_menu_model.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
 using base::ASCIIToUTF16;
 
 namespace {
 
 class AutofillSectionContainerTest : public ui::CocoaTest {
  public:
@@ skipping 85 matching lines @@
   EXPECT_NSEQ(@"Year", [yearPopup itemTitleAtIndex:0]);
 };
 
 TEST_F(AutofillSectionContainerTest, OutputMatchesDefinition) {
   using namespace autofill;
   using namespace testing;
 
   const DetailInput kTestInputs[] = {
     { DetailInput::LONG,
       EMAIL_ADDRESS,
-      IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL) },

[groby-ooo-7-16, 2014/01/04 01:15:33]

Since the string constants are never used in the test, might as well just have
string16() here. Or ASCIIToUTF16("placeholder"). No need to pull in l10nutil

[Dan Beam, 2014/01/04 01:39:23]

Done.

     { DetailInput::SHORT, CREDIT_CARD_EXP_MONTH },
   };
   autofill::MonthComboboxModel comboModel;
   DetailInputs inputs;
   inputs.push_back(kTestInputs[0]);
   inputs.push_back(kTestInputs[1]);
 
   EXPECT_CALL(delegate_, RequestedFieldsForSection(section_))
       .WillOnce(ReturnRef(inputs));
   EXPECT_CALL(delegate_, ComboboxModelForAutofillType(EMAIL_ADDRESS))
@@ skipping 44 matching lines @@
   EXPECT_NSEQ(@"b", [[menu itemAtIndex:2] title]);
 }
 
 TEST_F(AutofillSectionContainerTest, FieldsAreInitiallyValid) {
   using namespace autofill;
   using namespace testing;
 
   const DetailInput kTestInputs[] = {
     { DetailInput::LONG,
       EMAIL_ADDRESS,
-      IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL) },
     { DetailInput::SHORT, CREDIT_CARD_EXP_MONTH },
   };
 
   MonthComboboxModel comboModel;
   DetailInputs inputs;
   inputs.push_back(kTestInputs[0]);
   inputs.push_back(kTestInputs[1]);
 
   EXPECT_CALL(delegate_, RequestedFieldsForSection(section_))
       .WillOnce(ReturnRef(inputs));
   EXPECT_CALL(delegate_, ComboboxModelForAutofillType(EMAIL_ADDRESS))
       .WillRepeatedly(ReturnNull());
   EXPECT_CALL(delegate_, ComboboxModelForAutofillType(CREDIT_CARD_EXP_MONTH))
       .WillRepeatedly(Return(&comboModel));
 
   ResetContainer();
   NSControl<AutofillInputField>* field = [container_ getField:EMAIL_ADDRESS];
   EXPECT_FALSE([field invalid]);
   field = [container_ getField:CREDIT_CARD_EXP_MONTH];
   EXPECT_FALSE([field invalid]);
 }
 
 TEST_F(AutofillSectionContainerTest, ControllerInformsValidity) {
   using namespace autofill;
   using namespace testing;
 
   const DetailInput kTestInputs[] = {
-    { DetailInput::LONG, EMAIL_ADDRESS, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
+    { DetailInput::LONG,
+      EMAIL_ADDRESS,
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL) },
     { DetailInput::SHORT, CREDIT_CARD_EXP_MONTH }
   };
 
   MonthComboboxModel comboModel;
   DetailInputs inputs;
   inputs.push_back(kTestInputs[0]);
   inputs.push_back(kTestInputs[1]);
 
   ValidityMessages validity, validity2;
 
@@ skipping 20 matching lines @@
   EXPECT_TRUE([field invalid]);
   field = [container_ getField:CREDIT_CARD_EXP_MONTH];
   EXPECT_FALSE([field invalid]);
 
   [container_ validateFor:VALIDATE_FINAL];
   field = [container_ getField:EMAIL_ADDRESS];
   EXPECT_FALSE([field invalid]);
   field = [container_ getField:CREDIT_CARD_EXP_MONTH];
   EXPECT_TRUE([field invalid]);
 }