Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "base/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
@@ skipping 68 matching lines @@
                   longestEffectiveRange:&range inRange:fullRange];
     NSFontManager* fontManager = [NSFontManager sharedFontManager];
     if (runFont && (mask == ([fontManager traitsOfFont:runFont]&mask))) {
       return true;
     }
     return false;
   }
 
   // AutocompleteMatch doesn't really have the right constructor for our
   // needs.  Fake one for us to use.
-  static AutocompleteMatch MakeMatch(const string16 &contents,
-                                     const string16 &description) {
+  static AutocompleteMatch MakeMatch(const std::wstring &contents,
+                                     const std::wstring &description) {
     AutocompleteMatch m(NULL, 1, true, AutocompleteMatch::URL_WHAT_YOU_TYPED);
     m.contents = contents;
     m.description = description;
     return m;
   }
 
   NSColor* color_;  // weak
   NSColor* dimColor_;  // weak
   gfx::Font font_;
 };
 
 // Simple inputs with no matches should result in styled output who's
 // text matches the input string, with the passed-in color, and
 // nothing bolded.
 TEST_F(AutocompletePopupViewMacTest, DecorateMatchedStringNoMatch) {
   NSString* const string = @"This is a test";
   AutocompleteMatch::ACMatchClassifications classifications;
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::DecorateMatchedString(
-          base::SysNSStringToUTF16(string), classifications,
+          base::SysNSStringToWide(string), classifications,
           color_, dimColor_, font_);
 
   // Result has same characters as the input.
   EXPECT_EQ([decorated length], [string length]);
   EXPECT_TRUE([[decorated string] isEqualToString:string]);
 
   // Our passed-in color for the entire string.
   EXPECT_EQ(RunLengthForAttribute(decorated, 0U,
                                   NSForegroundColorAttributeName),
             [string length]);
   EXPECT_TRUE(RunHasColor(decorated, 0U, color_));
 
   // An unbolded font for the entire string.
   EXPECT_EQ(RunLengthForAttribute(decorated, 0U,
                                   NSFontAttributeName), [string length]);
   EXPECT_FALSE(RunHasFontTrait(decorated, 0U, NSBoldFontMask));
 }
 
 // Identical to DecorateMatchedStringNoMatch, except test that URL
 // style gets a different color than we passed in.
 TEST_F(AutocompletePopupViewMacTest, DecorateMatchedStringURLNoMatch) {
   NSString* const string = @"This is a test";
   AutocompleteMatch::ACMatchClassifications classifications;
 
   classifications.push_back(
       ACMatchClassification(0, ACMatchClassification::URL));
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::DecorateMatchedString(
-          base::SysNSStringToUTF16(string), classifications,
+          base::SysNSStringToWide(string), classifications,
           color_, dimColor_, font_);
 
   // Result has same characters as the input.
   EXPECT_EQ([decorated length], [string length]);
   EXPECT_TRUE([[decorated string] isEqualToString:string]);
 
   // One color for the entire string, and it's not the one we passed in.
   EXPECT_EQ(RunLengthForAttribute(decorated, 0U,
                                   NSForegroundColorAttributeName),
             [string length]);
@@ skipping 18 matching lines @@
   classifications.push_back(
       ACMatchClassification(0, ACMatchClassification::NONE));
   classifications.push_back(
       ACMatchClassification(runLength1, ACMatchClassification::DIM));
   classifications.push_back(
       ACMatchClassification(runLength1 + runLength2,
                             ACMatchClassification::NONE));
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::DecorateMatchedString(
-          base::SysNSStringToUTF16(string), classifications,
+          base::SysNSStringToWide(string), classifications,
           color_, dimColor_, font_);
 
   // Result has same characters as the input.
   EXPECT_EQ([decorated length], [string length]);
   EXPECT_TRUE([[decorated string] isEqualToString:string]);
 
   // Should have three font runs, normal, dim, normal.
   EXPECT_EQ(RunLengthForAttribute(decorated, 0U,
                                   NSForegroundColorAttributeName),
             runLength1);
@@ skipping 29 matching lines @@
   classifications.push_back(
       ACMatchClassification(0, ACMatchClassification::NONE));
   classifications.push_back(
       ACMatchClassification(runLength1, ACMatchClassification::MATCH));
   classifications.push_back(
       ACMatchClassification(runLength1 + runLength2,
                             ACMatchClassification::NONE));
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::DecorateMatchedString(
-          base::SysNSStringToUTF16(string), classifications,
+          base::SysNSStringToWide(string), classifications,
           color_, dimColor_, font_);
 
   // Result has same characters as the input.
   EXPECT_EQ([decorated length], [string length]);
   EXPECT_TRUE([[decorated string] isEqualToString:string]);
 
   // Our passed-in color for the entire string.
   EXPECT_EQ(RunLengthForAttribute(decorated, 0U,
                                   NSForegroundColorAttributeName),
             [string length]);
@@ skipping 27 matching lines @@
   classifications.push_back(
       ACMatchClassification(0, ACMatchClassification::URL));
   const int kURLMatch = ACMatchClassification::URL|ACMatchClassification::MATCH;
   classifications.push_back(ACMatchClassification(runLength1, kURLMatch));
   classifications.push_back(
       ACMatchClassification(runLength1 + runLength2,
                             ACMatchClassification::URL));
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::DecorateMatchedString(
-          base::SysNSStringToUTF16(string), classifications,
+          base::SysNSStringToWide(string), classifications,
           color_, dimColor_, font_);
 
   // Result has same characters as the input.
   EXPECT_EQ([decorated length], [string length]);
   EXPECT_TRUE([[decorated string] isEqualToString:string]);
 
   // One color for the entire string, and it's not the one we passed in.
   EXPECT_EQ(RunLengthForAttribute(decorated, 0U,
                                   NSForegroundColorAttributeName),
             [string length]);
@@ skipping 14 matching lines @@
                                NSBoldFontMask));
 }
 
 // Check that matches with both contents and description come back
 // with contents at the beginning, description at the end, and
 // something separating them.  Not being specific about the separator
 // on purpose, in case it changes.
 TEST_F(AutocompletePopupViewMacTest, MatchText) {
   NSString* const contents = @"contents";
   NSString* const description = @"description";
-  AutocompleteMatch m = MakeMatch(base::SysNSStringToUTF16(contents),
-                                  base::SysNSStringToUTF16(description));
+  AutocompleteMatch m = MakeMatch(base::SysNSStringToWide(contents),
+                                  base::SysNSStringToWide(description));
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::MatchText(m, font_, kLargeWidth);
 
   // Result contains the characters of the input in the right places.
   EXPECT_GT([decorated length], [contents length] + [description length]);
   EXPECT_TRUE([[decorated string] hasPrefix:contents]);
   EXPECT_TRUE([[decorated string] hasSuffix:description]);
 
   // Check that the description is a different color from the
@@ skipping 14 matching lines @@
 }
 
 // Check that MatchText() styles content matches as expected.
 TEST_F(AutocompletePopupViewMacTest, MatchTextContentsMatch) {
   NSString* const contents = @"This is a test";
   // Match "is".
   const NSUInteger runLength1 = 5, runLength2 = 2, runLength3 = 7;
   // Make sure nobody messed up the inputs.
   EXPECT_EQ(runLength1 + runLength2 + runLength3, [contents length]);
 
-  AutocompleteMatch m = MakeMatch(base::SysNSStringToUTF16(contents),
-                                  string16());
+  AutocompleteMatch m = MakeMatch(base::SysNSStringToWide(contents),
+                                  std::wstring());
 
   // Push each run onto contents classifications.
   m.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::NONE));
   m.contents_class.push_back(
       ACMatchClassification(runLength1, ACMatchClassification::MATCH));
   m.contents_class.push_back(
       ACMatchClassification(runLength1 + runLength2,
                             ACMatchClassification::NONE));
 
@@ skipping 26 matching lines @@
 
 // Check that MatchText() styles description matches as expected.
 TEST_F(AutocompletePopupViewMacTest, MatchTextDescriptionMatch) {
   NSString* const contents = @"This is a test";
   NSString* const description = @"That was a test";
   // Match "That was".
   const NSUInteger runLength1 = 8, runLength2 = 7;
   // Make sure nobody messed up the inputs.
   EXPECT_EQ(runLength1 + runLength2, [description length]);
 
-  AutocompleteMatch m = MakeMatch(base::SysNSStringToUTF16(contents),
-                                  base::SysNSStringToUTF16(description));
+  AutocompleteMatch m = MakeMatch(base::SysNSStringToWide(contents),
+                                  base::SysNSStringToWide(description));
 
   // Push each run onto contents classifications.
   m.description_class.push_back(
       ACMatchClassification(0, ACMatchClassification::MATCH));
   m.description_class.push_back(
       ACMatchClassification(runLength1, ACMatchClassification::NONE));
 
   NSAttributedString* decorated =
       AutocompletePopupViewMac::MatchText(m, font_, kLargeWidth);
 
@@ skipping 25 matching lines @@
   EXPECT_TRUE(RunHasFontTrait(decorated, descriptionLocation, NSBoldFontMask));
 
   EXPECT_EQ(RunLengthForAttribute(decorated, descriptionLocation + runLength1,
                                   NSFontAttributeName), runLength2);
   EXPECT_FALSE(RunHasFontTrait(decorated, descriptionLocation + runLength1,
                                NSBoldFontMask));
 }
 
 TEST_F(AutocompletePopupViewMacTest, ElideString) {
   NSString* const contents = @"This is a test with long contents";
-  const string16 contents16(base::SysNSStringToUTF16(contents));
+  const std::wstring wideContents(base::SysNSStringToWide(contents));
 
   const float kWide = 1000.0;
   const float kNarrow = 20.0;
 
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:font_.GetNativeFont()
                                   forKey:NSFontAttributeName];
   scoped_nsobject<NSMutableAttributedString> as(
       [[NSMutableAttributedString alloc] initWithString:contents
                                              attributes:attributes]);
 
   // Nothing happens if the space is really wide.
   NSMutableAttributedString* ret =
-      AutocompletePopupViewMac::ElideString(as, contents16, font_, kWide);
+      AutocompletePopupViewMac::ElideString(as, wideContents, font_, kWide);
   EXPECT_TRUE(ret == as);
   EXPECT_TRUE([[as string] isEqualToString:contents]);
 
   // When elided, result is the same as ElideText().
-  ret = AutocompletePopupViewMac::ElideString(as, contents16, font_, kNarrow);
-  string16 elided = ui::ElideText(contents16, font_, kNarrow, false);
+  ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, kNarrow);
+  std::wstring elided(UTF16ToWideHack(ui::ElideText(WideToUTF16Hack(
+      wideContents), font_, kNarrow, false)));
   EXPECT_TRUE(ret == as);
   EXPECT_FALSE([[as string] isEqualToString:contents]);
-  EXPECT_TRUE([[as string] isEqualToString:base::SysUTF16ToNSString(elided)]);
+  EXPECT_TRUE([[as string] isEqualToString:base::SysWideToNSString(elided)]);
 
   // When elided, result is the same as ElideText().
-  ret = AutocompletePopupViewMac::ElideString(as, contents16, font_, 0.0);
-  elided = ui::ElideText(contents16, font_, 0.0, false);
+  ret = AutocompletePopupViewMac::ElideString(as, wideContents, font_, 0.0);
+  elided = UTF16ToWideHack(ui::ElideText(WideToUTF16Hack(wideContents), font_,
+                                     0.0, false));
   EXPECT_TRUE(ret == as);
   EXPECT_FALSE([[as string] isEqualToString:contents]);
-  EXPECT_TRUE([[as string] isEqualToString:base::SysUTF16ToNSString(elided)]);
+  EXPECT_TRUE([[as string] isEqualToString:base::SysWideToNSString(elided)]);
 }
 
 TEST_F(AutocompletePopupViewMacTest, MatchTextElide) {
   NSString* const contents = @"This is a test with long contents";
   NSString* const description = @"That was a test";
   // Match "long".
   const NSUInteger runLength1 = 20, runLength2 = 4, runLength3 = 9;
   // Make sure nobody messed up the inputs.
   EXPECT_EQ(runLength1 + runLength2 + runLength3, [contents length]);
 
-  AutocompleteMatch m = MakeMatch(base::SysNSStringToUTF16(contents),
-                                  base::SysNSStringToUTF16(description));
+  AutocompleteMatch m = MakeMatch(base::SysNSStringToWide(contents),
+                                  base::SysNSStringToWide(description));
 
   // Push each run onto contents classifications.
   m.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::NONE));
   m.contents_class.push_back(
       ACMatchClassification(runLength1, ACMatchClassification::MATCH));
   m.contents_class.push_back(
       ACMatchClassification(runLength1 + runLength2,
                             ACMatchClassification::URL));
 
@@ skipping 46 matching lines @@
 // updates the model's selection from the matrix before returning.
 // Could possibly test that via -select:.
 
 // TODO(shess): Test that AutocompleteButtonCell returns the right
 // background colors for on, highlighted, and neither.
 
 // TODO(shess): Test that AutocompleteMatrixTarget can be initialized
 // and then sends -select: to the view.
 
 }  // namespace