Drop |languages| from {Format,Elide}Url* and IDNToUnicode

chrome/browser/ui/cocoa/status_bubble_mac.mm

 // 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 "chrome/browser/ui/cocoa/status_bubble_mac.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 184 matching lines @@
   completion_handler_factory_.InvalidateWeakPtrs();
   Detach();
   [window_ release];
   window_ = nil;
 }
 
 void StatusBubbleMac::SetStatus(const base::string16& status) {
   SetText(status, false);
 }
 
-void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
+void StatusBubbleMac::SetURL(const GURL& url) {
   url_ = url;
-  languages_ = languages;
 
   CGFloat bubble_width = NSWidth([window_ frame]);
   if (state_ == kBubbleHidden) {
     // TODO(rohitrao): The window size is expected to be (1,1) whenever the
     // window is hidden, but the GPU bots are hitting cases where this is not
     // true.  Instead of enforcing this invariant with a DCHECK, add temporary
     // logging to try and debug it and fix up the window size if needed.
     // This logging is temporary and should be removed: crbug.com/467998
     NSRect frame = [window_ frame];
     if (!CGSizeEqualToSize(frame.size, ui::kWindowSizeDeterminedLater.size)) {
@@ skipping 11 matching lines @@
                                     kTextPadding);
 
   // Scale from view to window coordinates before eliding URL string.
   NSSize scaled_width = NSMakeSize(text_width, 0);
   scaled_width = [[parent_ contentView] convertSize:scaled_width fromView:nil];
   text_width = static_cast<int>(scaled_width.width);
   NSFont* font = [[window_ contentView] font];
   gfx::FontList font_list_chr(
       gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font)));
 
-  base::string16 original_url_text = url_formatter::FormatUrl(url, languages);
+  base::string16 original_url_text = url_formatter::FormatUrl(url);
   base::string16 status =
-      url_formatter::ElideUrl(url, font_list_chr, text_width, languages);
+      url_formatter::ElideUrl(url, font_list_chr, text_width);
 
   SetText(status, true);
 
   // In testing, don't use animation. When ExpandBubble is tested, it is
   // called explicitly.
   if (immediate_)
     return;
   else
     CancelExpandTimer();
 
@@ skipping 450 matching lines @@
   NSRect window_frame = CalculateWindowFrame(/*expand=*/true);
   CGFloat max_bubble_width = NSWidth(window_frame);
   CGFloat standard_bubble_width =
       NSWidth(CalculateWindowFrame(/*expand=*/false));
 
   // Generate the URL string that fits in the expanded bubble.
   NSFont* font = [[window_ contentView] font];
   gfx::FontList font_list_chr(
       gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font)));
   base::string16 expanded_url = url_formatter::ElideUrl(
-      url_, font_list_chr, max_bubble_width, languages_);
+      url_, font_list_chr, max_bubble_width);
 
   // Scale width from gfx::Font in view coordinates to window coordinates.
   int required_width_for_string =
       gfx::GetStringWidth(expanded_url, font_list_chr) +
           kTextPadding * 2 + kBubbleViewTextPositionX;
   NSSize scaled_width = NSMakeSize(required_width_for_string, 0);
   scaled_width = [[parent_ contentView] convertSize:scaled_width toView:nil];
   required_width_for_string = scaled_width.width;
 
   // The expanded width must be at least as wide as the standard width, but no
@@ skipping 128 matching lines @@
     }
 
     // Round the top corners when the bubble is below the parent window.
     if (NSMinY(window_frame) < NSMinY(parent_frame)) {
       corner_flags |= kRoundedTopLeftCorner | kRoundedTopRightCorner;
     }
   }
 
   return corner_flags;
 }