Revert of Enable url_formatter::ElideUrl and url_formatter::ElideHost for aura Android

ui/gfx/text_elider.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.
 //
 // This file implements utility functions for eliding and formatting UI text.
 //
 // Note that several of the functions declared in text_elider.h are implemented
 // in this file using helper classes in an unnamed namespace.
 
 #include "ui/gfx/text_elider.h"
@@ skipping 21 matching lines @@
 #include "ui/gfx/text_utils.h"
 
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 using base::WideToUTF16;
 
 namespace gfx {
 
 namespace {
 
-#if defined(OS_ANDROID) && !defined(USE_AURA) || defined(OS_IOS)
+#if defined(OS_ANDROID) || defined(OS_IOS)
 // The returned string will have at least one character besides the ellipsis
 // on either side of '@'; if that's impossible, a single ellipsis is returned.
 // If possible, only the username is elided. Otherwise, the domain is elided
 // in the middle, splitting available width equally with the elided username.
 // If the username is short enough that it doesn't need half the available
 // width, the elided domain will occupy that extra width.
 base::string16 ElideEmail(const base::string16& email,
                           const FontList& font_list,
                           float available_pixel_width) {
   if (GetStringWidthF(email, font_list) <= available_pixel_width)
@@ skipping 134 matching lines @@
   base::string16 elided_name =
       ElideText(rootname, font_list, available_root_width, ELIDE_TAIL);
   elided_name += extension;
   return base::i18n::GetDisplayStringInLTRDirectionality(elided_name);
 }
 
 base::string16 ElideText(const base::string16& text,
                          const FontList& font_list,
                          float available_pixel_width,
                          ElideBehavior behavior) {
-#if defined(OS_ANDROID) && !defined(USE_AURA) || defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+  DCHECK_NE(behavior, FADE_TAIL);
+  scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
+  render_text->SetCursorEnabled(false);
+  // Do not bother accurately sizing strings over 5000 characters here, for
+  // performance purposes. This matches the behavior of Canvas::SizeStringFloat.
+  render_text->set_truncate_length(5000);
+  render_text->SetFontList(font_list);
+  available_pixel_width = std::ceil(available_pixel_width);
+  render_text->SetDisplayRect(
+      gfx::ToEnclosingRect(gfx::RectF(gfx::SizeF(available_pixel_width, 1))));
+  render_text->SetElideBehavior(behavior);
+  render_text->SetText(text);
+  return render_text->GetDisplayText();
+#else
   DCHECK_NE(behavior, FADE_TAIL);
   if (text.empty() || behavior == FADE_TAIL || behavior == NO_ELIDE ||
       GetStringWidthF(text, font_list) <= available_pixel_width) {
     return text;
   }
   if (behavior == ELIDE_EMAIL)
     return ElideEmail(text, font_list, available_pixel_width);
 
   const bool elide_in_middle = (behavior == ELIDE_MIDDLE);
   const bool elide_at_beginning = (behavior == ELIDE_HEAD);
@@ skipping 23 matching lines @@
       hi = guess - 1;
       // Move back on the loop terminating condition when the guess is too wide.
       if (hi < lo)
         lo = hi;
     } else {
       lo = guess + 1;
     }
   }
 
   return cut;
-#else
-  DCHECK_NE(behavior, FADE_TAIL);
-  scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
-  render_text->SetCursorEnabled(false);
-  // TODO(bshe): 5000 is out dated. We should remove it. See crbug.com/551660.

[msw, 2016/01/06 18:58:11]

It would have been nice to keep this updated comment.

[bshe, 2016/01/06 19:05:30]

Will upload a new patch to add the comment back.

-  // Do not bother accurately sizing strings over 5000 characters here, for
-  // performance purposes. This matches the behavior of Canvas::SizeStringFloat.
-  render_text->set_truncate_length(5000);
-  render_text->SetFontList(font_list);
-  available_pixel_width = std::ceil(available_pixel_width);
-  render_text->SetDisplayRect(
-      gfx::ToEnclosingRect(gfx::RectF(gfx::SizeF(available_pixel_width, 1))));
-  render_text->SetElideBehavior(behavior);
-  render_text->SetText(text);
-  return render_text->GetDisplayText();
 #endif
 }
 
 bool ElideString(const base::string16& input,
                  int max_len,
                  base::string16* output) {
   DCHECK_GE(max_len, 0);
   if (static_cast<int>(input.length()) <= max_len) {
     output->assign(input);
     return false;
@@ skipping 544 matching lines @@
   // of, and we can fit at least one character of the word in the elided string.
   // Do that rather than just returning an ellipsis.
   if (word_break && (index != static_cast<int32_t>(length - 1)))
     return string.substr(0, length - 1) + kElideString;
 
   // Trying to break after only whitespace, elide all of it.
   return kElideString;
 }
 
 }  // namespace gfx