[Android Refactor] Move webapk_ukm_recorder.* to webapk directory

BUG=None

Change-Id: I7348eb18a4c93b026222757e9a85503c538378d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808789Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697328}

chrome/browser/BUILD.gn

@@ -2717,6 +2717,8 @@ jumbo_split_static_library("browser") {
       "android/webapk/webapk_post_share_target_navigator.cc",
       "android/webapk/webapk_post_share_target_navigator.h",
       "android/webapk/webapk_types.h",
+      "android/webapk/webapk_ukm_recorder.cc",
+      "android/webapk/webapk_ukm_recorder.h",
       "android/webapk/webapk_update_data_fetcher.cc",
       "android/webapk/webapk_update_data_fetcher.h",
       "android/webapk/webapk_update_manager.cc",
@@ -2726,8 +2728,6 @@ jumbo_split_static_library("browser") {
       "android/webapps/add_to_homescreen_data_fetcher.h",
       "android/webapps/add_to_homescreen_manager.cc",
       "android/webapps/add_to_homescreen_manager.h",
-      "android/webapps/webapk_ukm_recorder.cc",
-      "android/webapps/webapk_ukm_recorder.h",
       "android/webapps/webapp_registry.cc",
       "android/webapps/webapp_registry.h",
       "android/widget/thumbnail_generator.cc",

chrome/browser/android/webapk/webapk_installer.cc

@@ -34,7 +34,7 @@
 #include "chrome/browser/android/webapk/webapk_icon_hasher.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/android/webapk/webapk_metrics.h"
-#include "chrome/browser/android/webapps/webapk_ukm_recorder.h"
+#include "chrome/browser/android/webapk/webapk_ukm_recorder.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/android/webapps/webapk_ukm_recorder.cc → chrome/browser/android/webapk/webapk_ukm_recorder.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/webapps/webapk_ukm_recorder.h"
+#include "chrome/browser/android/webapk/webapk_ukm_recorder.h"
 
 #include <jni.h>
 

chrome/browser/android/webapps/webapk_ukm_recorder.h → chrome/browser/android/webapk/webapk_ukm_recorder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_WEBAPPS_WEBAPK_UKM_RECORDER_H_
-#define CHROME_BROWSER_ANDROID_WEBAPPS_WEBAPK_UKM_RECORDER_H_
+#ifndef CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_UKM_RECORDER_H_
+#define CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_UKM_RECORDER_H_
 
 #include <stdint.h>
 
@@ -35,4 +35,4 @@ class WebApkUkmRecorder {
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebApkUkmRecorder);
 };
 
-#endif  // CHROME_BROWSER_ANDROID_WEBAPPS_WEBAPK_UKM_RECORDER_H_
+#endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_UKM_RECORDER_H_