Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_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 <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
@@ skipping 84 matching lines @@
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
 
   // Load available decorations and try drawing.  To make sure that
   // they are actually drawn, check that |GetWidthForSpace()| doesn't
   // indicate that they should be omitted.
   const CGFloat kVeryWide = 1000.0;
 
   SelectedKeywordDecoration selected_keyword_decoration([view_ font]);
   selected_keyword_decoration.SetVisible(true);
-  selected_keyword_decoration.SetKeyword(ASCIIToUTF16("Google"), false);
+  selected_keyword_decoration.SetKeyword(std::wstring(L"Google"), false);
   [cell addLeftDecoration:&selected_keyword_decoration];
   EXPECT_NE(selected_keyword_decoration.GetWidthForSpace(kVeryWide),
             LocationBarDecoration::kOmittedWidth);
 
   // TODO(shess): This really wants a |LocationBarViewMac|, but only a
   // few methods reference it, so this works well enough.  But
   // something better would be nice.
   LocationIconDecoration location_icon_decoration(NULL);
   location_icon_decoration.SetVisible(true);
   location_icon_decoration.SetImage([NSImage imageNamed:@"NSApplicationIcon"]);
@@ skipping 176 matching lines @@
   // |controlView| gets the tooltip for the left decoration.
   id controlView = [OCMockObject mockForClass:[AutocompleteTextField class]];
   [[controlView expect] addToolTip:tooltip forRect:leftDecorationRect];
 
   [cell updateToolTipsInRect:bounds ofView:controlView];
 
   [controlView verify];
 }
 
 }  // namespace