Refactor ShortcutHelper and merge in BookmarkUtils

chrome/android/java/src/org/chromium/chrome/browser/document/DocumentUma.java

 // Copyright 2015 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.document;
 
 import android.content.Intent;
 
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.BookmarkUtils;
 import org.chromium.chrome.browser.IntentHandler;
+import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.util.IntentUtils;
 
 /**
  * Records UMA relevant to Document mode.
  */
 public class DocumentUma {
     /**
      * Records what caused a DocumentActivity to be resumed.
      */
     static void recordStartedBy(int source) {
@@ skipping 17 matching lines @@
         }
 
         int intentSource = DocumentMetricIds.STARTED_BY_UNKNOWN;
         IntentHandler.ExternalAppId appId =
                 IntentHandler.determineExternalIntentSource(packageName, intent);
 
         if (intent.hasExtra(IntentHandler.EXTRA_STARTED_BY)) {
             intentSource = IntentUtils.safeGetIntExtra(intent,
                     IntentHandler.EXTRA_STARTED_BY, DocumentMetricIds.STARTED_BY_UNKNOWN);
         } else if (IntentUtils.safeGetBooleanExtra(intent,
-                BookmarkUtils.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB, false)) {
+                ShortcutHelper.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB, false)) {
             // TODO(dfalcantara): Add a new a boolean instead of piggybacking on this Intent extra.
             intentSource = DocumentMetricIds.STARTED_BY_LAUNCHER;
         } else if (IntentUtils.safeGetBooleanExtra(
                 intent, IntentHandler.EXTRA_APPEND_TASK, false)) {
             intentSource = DocumentMetricIds.STARTED_BY_SEARCH_RESULT_PAGE;
         } else if (IntentUtils.safeGetBooleanExtra(
                 intent, IntentHandler.EXTRA_PRESERVE_TASK, false)) {
             // TODO(dfalcantara): Figure out how split apart Intents fired by the search box.
             intentSource = DocumentMetricIds.STARTED_BY_SEARCH_SUGGESTION_EXTERNAL;
         } else if (appId == IntentHandler.ExternalAppId.GMAIL) {
@@ skipping 29 matching lines @@
         if (intentSource >= DocumentMetricIds.STARTED_BY_EXTERNAL_APP_GMAIL
                 && intentSource < DocumentMetricIds.STARTED_BY_CONTEXTUAL_SEARCH) {
             // Document activity was started from an external app, record which one.
             RecordHistogram.recordEnumeratedHistogram("MobileIntent.PageLoadDueToExternalApp",
                     appId.ordinal(), IntentHandler.ExternalAppId.INDEX_BOUNDARY.ordinal());
         }
 
         recordStartedBy(intentSource);
     }
 }