Merge ChromeShortcutManager into ShortcutHelper.

chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java

 // Copyright 2017 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;
 
 import android.app.Notification;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Looper;
@@ skipping 20 matching lines @@
 import org.chromium.chrome.browser.omaha.RequestGenerator;
 import org.chromium.chrome.browser.physicalweb.PhysicalWebBleClient;
 import org.chromium.chrome.browser.policy.PolicyAuditor;
 import org.chromium.chrome.browser.preferences.LocationSettings;
 import org.chromium.chrome.browser.rlz.RevenueStats;
 import org.chromium.chrome.browser.services.AndroidEduOwnerCheckCallback;
 import org.chromium.chrome.browser.signin.GoogleActivityController;
 import org.chromium.chrome.browser.sync.GmsCoreSyncListener;
 import org.chromium.chrome.browser.tab.AuthenticatorNavigationInterceptor;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.webapps.ChromeShortcutManager;
 import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
 import org.chromium.components.signin.AccountManagerDelegate;
 import org.chromium.components.signin.SystemAccountManagerDelegate;
 import org.chromium.policy.AppRestrictionsProvider;
 import org.chromium.policy.CombinedPolicyProvider;
 
 /**
  * Base class for defining methods where different behavior is required by downstream targets.
  * The correct version of {@link AppHooksImpl} will be determined at compile time via build rules.
  * See http://crbug/560466.
@@ skipping 55 matching lines @@
     }
 
     /**
      * Return a {@link AuthenticatorNavigationInterceptor} for the given {@link Tab}.
      * This can be null if there are no applicable interceptor to be built.
      */
     public AuthenticatorNavigationInterceptor createAuthenticatorNavigationInterceptor(Tab tab) {
         return null;
     }
 
-    /** Returns the singleton instance of ChromeShortcutManager */
-    // TODO(martiw): remove this function after ChromeShortcutManagerInternal is removed
-    public ChromeShortcutManager createChromeShortcutManager() {
-        return new ChromeShortcutManager();
-    }
-
     /**
      * @return An instance of {@link CustomTabsConnection}. Should not be called
      * outside of {@link CustomTabsConnection#getInstance()}.
      */
     public CustomTabsConnection createCustomTabsConnection() {
         return new CustomTabsConnection(((ChromeApplication) ContextUtils.getApplicationContext()));
     }
 
     /**
      * @return An instance of ExternalAuthUtils to be installed as a singleton.
@@ skipping 159 matching lines @@
     /**
      * @return Whether the renderer should detect whether video elements are in fullscreen. The
      * detection results can be retrieved through
      * {@link WebContents.hasActiveEffectivelyFullscreenVideo()}.
      */
     @CalledByNative
     public boolean shouldDetectVideoFullscreen() {
         return false;
     }
 }