rAc: try really hard not to ellipsize addresses

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 873 matching lines @@
   ASSERT_TRUE(!!email_model);
   EXPECT_EQ(4, email_model->GetItemCount());
 
   // The first one is the default.
   SuggestionsMenuModel* email_suggestions = static_cast<SuggestionsMenuModel*>(
       controller()->MenuModelForSection(SECTION_EMAIL));
   EXPECT_EQ(0, email_suggestions->checked_item());
 
   email_model->ActivatedAt(0);
   EXPECT_EQ(kEmail1,
-            controller()->SuggestionStateForSection(SECTION_EMAIL).text);
+            controller()->SuggestionStateForSection(SECTION_EMAIL).
+                vertically_compact_text);
   email_model->ActivatedAt(1);
   EXPECT_EQ(kEmail2,
-            controller()->SuggestionStateForSection(SECTION_EMAIL).text);
+            controller()->SuggestionStateForSection(SECTION_EMAIL).
+                vertically_compact_text);
 
   controller()->EditClickedForSection(SECTION_EMAIL);
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   EXPECT_EQ(kEmail2, inputs[0].initial_value);
 
   // The choice of variant is persisted across runs of the dialog.
   email_model->ActivatedAt(0);
   email_model->ActivatedAt(1);
   FillCreditCardInputs();
   controller()->OnAccept();
 
   Reset();
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   email_suggestions = static_cast<SuggestionsMenuModel*>(
       controller()->MenuModelForSection(SECTION_EMAIL));
   EXPECT_EQ(1, email_suggestions->checked_item());
 }
 
 TEST_F(AutofillDialogControllerTest, SuggestValidEmail) {
   AutofillProfile profile(test::GetVerifiedProfile());
   const string16 kValidEmail = ASCIIToUTF16(kFakeEmail);
   profile.SetRawInfo(EMAIL_ADDRESS, kValidEmail);
   controller()->GetTestingManager()->AddTestingProfile(&profile);
 
   controller()->MenuModelForSection(SECTION_EMAIL)->ActivatedAt(0);
   EXPECT_EQ(kValidEmail,
-            controller()->SuggestionStateForSection(SECTION_EMAIL).text);
+            controller()->SuggestionStateForSection(SECTION_EMAIL).
+                vertically_compact_text);
 }
 
 TEST_F(AutofillDialogControllerTest, DoNotSuggestInvalidEmail) {
   AutofillProfile profile(test::GetVerifiedProfile());
   profile.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16(".!#$%&'*+/=?^_`-@-.."));
   controller()->GetTestingManager()->AddTestingProfile(&profile);
   EXPECT_EQ(static_cast<ui::MenuModel*>(NULL),
             controller()->MenuModelForSection(SECTION_EMAIL));
 }
 
@@ skipping 504 matching lines @@
   ui::MenuModel* email_model =
       controller()->MenuModelForSection(SECTION_EMAIL);
   EXPECT_EQ(3, email_model->GetItemCount());
 
   // When unedited, the initial_value should be empty.
   email_model->ActivatedAt(0);
   const DetailInputs& inputs0 =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   EXPECT_EQ(string16(), inputs0[0].initial_value);
   EXPECT_EQ(kEmail,
-            controller()->SuggestionStateForSection(SECTION_EMAIL).text);
+            controller()->SuggestionStateForSection(SECTION_EMAIL).
+                vertically_compact_text);
 
   // When edited, the initial_value should contain the value.
   controller()->EditClickedForSection(SECTION_EMAIL);
   const DetailInputs& inputs1 =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   EXPECT_EQ(kEmail, inputs1[0].initial_value);
-  EXPECT_EQ(string16(),
-            controller()->SuggestionStateForSection(SECTION_EMAIL).text);
+  EXPECT_FALSE(controller()->SuggestionStateForSection(SECTION_EMAIL).show);
 
   // When edit is cancelled, the initial_value should be empty.
   controller()->EditCancelledForSection(SECTION_EMAIL);
   const DetailInputs& inputs2 =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   EXPECT_EQ(kEmail,
-            controller()->SuggestionStateForSection(SECTION_EMAIL).text);
+            controller()->SuggestionStateForSection(SECTION_EMAIL).
+                vertically_compact_text);
   EXPECT_EQ(string16(), inputs2[0].initial_value);
 }
 
 // Tests that editing an autofill profile and then submitting works.
 TEST_F(AutofillDialogControllerTest, EditAutofillProfile) {
   SwitchToAutofill();
 
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
@@ skipping 991 matching lines @@
   EXPECT_CALL(*test_bubble_controller(), ShowAsNewCardSavedBubble(_)).Times(0);
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
   controller()->set_dialog_type(DIALOG_TYPE_AUTOCHECKOUT);
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
   controller()->OnAutocheckoutError();
   controller()->ViewClosed();
 }
 
 }  // namespace autofill