Change signature of |ui::ElideText()|. Add a truncate mode.

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm

 // Copyright (c) 2011 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/omnibox/omnibox_popup_view_mac.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
@@ skipping 443 matching lines @@
                                              attributes:attributes]);
 
   // Nothing happens if the space is really wide.
   NSMutableAttributedString* ret =
       OmniboxPopupViewMac::ElideString(as, contents16, font_, kWide);
   EXPECT_TRUE(ret == as);
   EXPECT_TRUE([[as string] isEqualToString:contents]);
 
   // When elided, result is the same as ElideText().
   ret = OmniboxPopupViewMac::ElideString(as, contents16, font_, kNarrow);
-  string16 elided = ui::ElideText(contents16, font_, kNarrow, false);
+  string16 elided = ui::ElideText(contents16, font_, kNarrow, ui::ELIDE_AT_END);
   EXPECT_TRUE(ret == as);
   EXPECT_FALSE([[as string] isEqualToString:contents]);
   EXPECT_TRUE([[as string] isEqualToString:base::SysUTF16ToNSString(elided)]);
 
   // When elided, result is the same as ElideText().
   ret = OmniboxPopupViewMac::ElideString(as, contents16, font_, 0.0);
-  elided = ui::ElideText(contents16, font_, 0.0, false);
+  elided = ui::ElideText(contents16, font_, 0.0, ui::ELIDE_AT_END);
   EXPECT_TRUE(ret == as);
   EXPECT_FALSE([[as string] isEqualToString:contents]);
   EXPECT_TRUE([[as string] isEqualToString:base::SysUTF16ToNSString(elided)]);
 }
 
 TEST_F(OmniboxPopupViewMacTest, 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;
@@ skipping 61 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