Backed out changeset 2b027c3e1736 (
bug 1075531) for Android S4 Test Failures
--- 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() {