Move Android metrics files into a /metrics/ subfolder/package.

chrome/app/android/chrome_main_delegate_android.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/app/android/chrome_main_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/chrome_jni_registrar.h"
 #include "chrome/browser/android/chrome_startup_flags.h"
-#include "chrome/browser/android/uma_utils.h"
+#include "chrome/browser/android/metrics/uma_utils.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "content/public/browser/browser_main_runner.h"
 
 // ChromeMainDelegateAndroid is created when the library is loaded. It is always
 // done in the process's main Java thread. But for non browser process, e.g.
 // renderer process, it is not the native Chrome's main thread.
 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() {
 }
 
 ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() {
@@ skipping 30 matching lines @@
 }
 
 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
   SetChromeSpecificCommandLineFlags();
   return ChromeMainDelegate::BasicStartupComplete(exit_code);
 }
 
 bool ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(JNIEnv* env) {
   return chrome::android::RegisterJni(env);
 }