Refactor ShortcutHelper and merge in BookmarkUtils

chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
index 5f8f35e4a17b7e5f37f82b7063f903e6fd981eb3..61f375f5d2d198f078e4e8362eefbd5048e92989 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
@@ -17,7 +17,6 @@ import android.widget.ImageView;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.tab.Tab;
 
 /**
@@ -76,15 +75,15 @@ public class AddToHomescreenDialog {
             }
         });
 
-        final ShortcutHelper shortcutHelper =
-                new ShortcutHelper(activity.getApplicationContext(), currentTab);
+        final AddToHomescreenDialogHelper shortcutHelper =
+                new AddToHomescreenDialogHelper(activity.getApplicationContext(), currentTab);
 
         // Initializing the shortcut helper is asynchronous. Until it is
         // initialized, the UI will show a disabled text field and OK buttons.
         // They will be enabled and pre-filled as soon as the onInitialized
         // callback will be run. The user will still be able to cancel the
         // operation.
-        shortcutHelper.initialize(new ShortcutHelper.ShortcutHelperObserver() {
+        shortcutHelper.initialize(new AddToHomescreenDialogHelper.Observer() {
             @Override
             public void onUserTitleAvailable(String title) {
                 input.setEnabled(true);