Backed out changeset 2b027c3e1736 (bug 1075531) for Android S4 Test Failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 15 Oct 2014 14:08:19 +0200
changeset 210434 8a110b34d05b920c0b687455969777f534a720f4
parent 210433 a10bf2f2c66bc1d11801ac352f4054ce1f1e5da7
child 210435 92bacff87c213984bdc0d195c4d62bfc631d7dda
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1075531
milestone36.0a1
backs out2b027c3e17368ece2d620684de17f0c3c9e9e5d5
Backed out changeset 2b027c3e1736 (bug 1075531) for Android S4 Test Failures
mobile/android/base/tests/components/ToolbarComponent.java
--- a/mobile/android/base/tests/components/ToolbarComponent.java
+++ b/mobile/android/base/tests/components/ToolbarComponent.java
@@ -86,35 +86,35 @@ public class ToolbarComponent extends Ba
     }
     /**
      * Returns the View for the edit cancel button in the browser toolbar.
      */
     private ImageButton getEditCancelButton() {
         return (ImageButton) getToolbarView().findViewById(R.id.edit_cancel);
     }
 
-    private String getTitle() {
+    private CharSequence getTitle() {
         return getTitleHelper(true);
     }
 
     /**
      * Returns the title of the page. Note that this makes no assertions to Toolbar state and
      * may return a value that may never be visible to the user. Callers likely want to use
      * {@link assertTitle} instead.
      */
-    public String getPotentiallyInconsistentTitle() {
+    public CharSequence getPotentiallyInconsistentTitle() {
         return getTitleHelper(false);
     }
 
-    private String getTitleHelper(final boolean shouldAssertNotEditing) {
+    private CharSequence getTitleHelper(final boolean shouldAssertNotEditing) {
         if (shouldAssertNotEditing) {
             assertIsNotEditing();
         }
 
-        return getUrlTitleText().getText().toString();
+        return getUrlTitleText().getText();
     }
 
     private boolean isEditing() {
         return getUrlDisplayLayout().getVisibility() != View.VISIBLE &&
                 getUrlEditText().getVisibility() == View.VISIBLE;
     }
 
     public ToolbarComponent enterEditingMode() {