Revert of Move Java CachedMetrics functionality to base/.

chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.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.externalauth;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Binder;
 import android.os.StrictMode;
 import android.os.SystemClock;
 import android.text.TextUtils;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
-import org.chromium.base.metrics.CachedMetrics.SparseHistogramSample;
-import org.chromium.base.metrics.CachedMetrics.TimesHistogramSample;
 import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.metrics.LaunchMetrics.SparseHistogramSample;
+import org.chromium.chrome.browser.metrics.LaunchMetrics.TimesHistogramSample;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Utility class for external authentication tools.
  *
  * This class is safe to use on any thread.
  */
 public class ExternalAuthUtils {
@@ skipping 244 matching lines @@
     /**
      * Invokes whatever external code is necessary to obtain a textual description of an error
      * code produced by {@link #checkGooglePlayServicesAvailable(Context)}.
      * @param errorCode The code to check
      * @return a textual description of the error code
      */
     protected String describeError(final int errorCode) {
         return GoogleApiAvailability.getInstance().getErrorString(errorCode);
     }
 }