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

components/url_formatter/elide_url.h

Index: components/url_formatter/elide_url.h
diff --git a/components/url_formatter/elide_url.h b/components/url_formatter/elide_url.h
index 73c0baaf834b5336ac837e5a91539d44112c623e..74777deac3421cc40fe26705d497dadb49994b1e 100644
--- a/components/url_formatter/elide_url.h
+++ b/components/url_formatter/elide_url.h
@@ -21,7 +21,7 @@
 
 // ElideUrl and Elide host require
 // gfx::GetStringWidthF which is not implemented in Android
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
 // This function takes a GURL object and elides it. It returns a string
 // which composed of parts from subdomain, domain, path, filename and query.
 // A "..." is added automatically at the end if the elided string is bigger
@@ -49,7 +49,7 @@
 base::string16 ElideHost(const GURL& host_url,
                          const gfx::FontList& font_list,
                          float available_pixel_width);
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif  // !defined(OS_ANDROID)
 
 // This is a convenience function for formatting a URL in a concise and
 // human-friendly way, to help users make security-related decisions (or in