Refactor ShortcutHelper and merge in BookmarkUtils

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

 // Copyright 2014 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
 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;
 
 /**
  * Helper class showing the UI regarding Add to Homescreen and delegate the
  * logic to ShortcutHelper.
  */
 public class AddToHomescreenDialog {
     private static AlertDialog sCurrentDialog;
 
     @VisibleForTesting
@@ skipping 38 matching lines @@
                     // Force the text field to align better with the icon by accounting for the
                     // padding introduced by the background drawable.
                     input.getLayoutParams().height =
                             progressBarView.getMeasuredHeight() + input.getPaddingBottom();
                     v.requestLayout();
                     v.removeOnLayoutChangeListener(this);
                 }
             }
         });
 
-        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);
                 input.setText(title);
             }
 
             @Override
             public void onIconAvailable(Bitmap icon) {
                 progressBarView.setVisibility(View.GONE);
                 iconView.setVisibility(View.VISIBLE);
@@ skipping 47 matching lines @@
             @Override
             public void onDismiss(DialogInterface dialog) {
                 sCurrentDialog = null;
                 shortcutHelper.destroy();
             }
         });
 
         dialog.show();
     }
 }