[AW] move nonembedded UMA recorder and replayer classes

No change to logic, just moving some files around.

Both of nonembedded UMA recorder and replayer classes are just used in
a particular place and are not shared (or "common") between webview
code. So This moves them closer to where they are actually used:
- AwNonembeddedUmaRecorder is only used in nonembedded processes so it's
  moved to nonembedded dir.
- AwNonembeddedUmaReplayer is only used in the browser process so it's
  moved alongside the AwMetricsServiceClient.

This should align better with the scope of the current webview
subdirectories structure and help having better OWNERs scope for each
class.

Bug: N/A
Test: N/A
Change-Id: I34d8984956e8d657c8e70874f28de25cdc199bae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2228149
Commit-Queue: Hazem Ashmawy <hazems@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774837}

android_webview/BUILD.gn

@@ -464,6 +464,7 @@ android_library("browser_java") {
     "java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java",
     "java/src/org/chromium/android_webview/gfx/RootBeginFrameSourceWebView.java",
     "java/src/org/chromium/android_webview/metrics/AwMetricsServiceClient.java",
+    "java/src/org/chromium/android_webview/metrics/AwNonembeddedUmaReplayer.java",
     "java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
     "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
     "java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",
@@ -475,7 +476,6 @@ android_library("browser_java") {
     ":common_aidl_java",
     ":common_crash_java",
     ":common_java",
-    ":common_metrics_java",
     ":common_platform_services_java",
     ":common_variations_java",
     ":resources",
@@ -524,20 +524,6 @@ android_library("browser_java") {
   ]
 }
 
-android_library("common_metrics_java") {
-  sources = [
-    "java/src/org/chromium/android_webview/common/metrics/AwNonembeddedUmaRecorder.java",
-    "java/src/org/chromium/android_webview/common/metrics/AwNonembeddedUmaReplayer.java",
-  ]
-  deps = [
-    ":common_aidl_java",
-    ":common_java",
-    "//android_webview/proto:metrics_bridge_records_proto_java",
-    "//base:base_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
-  ]
-}
-
 android_library("common_variations_java") {
   sources = [
     "java/src/org/chromium/android_webview/common/variations/VariationsServiceMetricsHelper.java",

android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java

@@ -19,11 +19,11 @@
 
 import org.chromium.android_webview.common.AwSwitches;
 import org.chromium.android_webview.common.PlatformServiceBridge;
-import org.chromium.android_webview.common.metrics.AwNonembeddedUmaReplayer;
 import org.chromium.android_webview.common.services.ICrashReceiverService;
 import org.chromium.android_webview.common.services.IMetricsBridgeService;
 import org.chromium.android_webview.common.services.ServiceNames;
 import org.chromium.android_webview.metrics.AwMetricsServiceClient;
+import org.chromium.android_webview.metrics.AwNonembeddedUmaReplayer;
 import org.chromium.android_webview.policy.AwPolicyProvider;
 import org.chromium.android_webview.proto.MetricsBridgeRecords.HistogramRecord;
 import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConfigHelper;

android_webview/java/src/org/chromium/android_webview/common/metrics/AwNonembeddedUmaReplayer.java → android_webview/java/src/org/chromium/android_webview/metrics/AwNonembeddedUmaReplayer.java

@@ -1,7 +1,7 @@
 // Copyright 2020 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.android_webview.common.metrics;
+package org.chromium.android_webview.metrics;
 
 import android.os.Bundle;
 

android_webview/javatests/src/org/chromium/android_webview/test/common/metrics/AwNonembeddedUmaRecorderTest.java → android_webview/javatests/src/org/chromium/android_webview/test/devui/AwNonembeddedUmaRecorderTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview.test.common.metrics;
+package org.chromium.android_webview.test.devui;
 
 import static org.chromium.android_webview.test.OnlyRunIn.ProcessMode.SINGLE_PROCESS;
 
@@ -13,7 +13,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.android_webview.common.metrics.AwNonembeddedUmaRecorder;
+import org.chromium.android_webview.nonembedded.AwNonembeddedUmaRecorder;
 import org.chromium.android_webview.proto.MetricsBridgeRecords.HistogramRecord;
 import org.chromium.android_webview.proto.MetricsBridgeRecords.HistogramRecord.RecordType;
 import org.chromium.android_webview.test.AwJUnit4ClassRunner;

android_webview/junit/src/org/chromium/android_webview/robolectric/common/metrics/AwNonembeddedUmaReplayerTest.java → android_webview/junit/src/org/chromium/android_webview/robolectric/metrics/AwNonembeddedUmaReplayerTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview.robolectric.common.metrics;
+package org.chromium.android_webview.robolectric.metrics;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -15,7 +15,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import org.chromium.android_webview.common.metrics.AwNonembeddedUmaReplayer;
+import org.chromium.android_webview.metrics.AwNonembeddedUmaReplayer;
 import org.chromium.android_webview.proto.MetricsBridgeRecords.HistogramRecord;
 import org.chromium.android_webview.proto.MetricsBridgeRecords.HistogramRecord.RecordType;
 import org.chromium.base.metrics.UmaRecorder;

android_webview/nonembedded/BUILD.gn

@@ -14,6 +14,7 @@ generate_jni("nonembedded_jni_headers") {
 # as a library.
 android_library("nonembedded_java") {
   sources = [
+    "java/src/org/chromium/android_webview/nonembedded/AwNonembeddedUmaRecorder.java",
     "java/src/org/chromium/android_webview/nonembedded/LicenseActivity.java",
     "java/src/org/chromium/android_webview/nonembedded/LicenseContentProvider.java",
     "java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java",
@@ -22,12 +23,14 @@ android_library("nonembedded_java") {
     ":devui_java",
     ":services_java",
     "//android_webview:android_webview_product_config_java",
+    "//android_webview:common_aidl_java",
     "//android_webview:common_java",
-    "//android_webview:common_metrics_java",
+    "//android_webview/proto:metrics_bridge_records_proto_java",
     "//base:base_java",
     "//base:jni_java",
     "//components/about_ui/android:aboutui_java",
     "//components/embedder_support/android:application_java",
+    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//ui/android:ui_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -56,7 +59,6 @@ android_library("devui_java") {
     "//android_webview:common_aidl_java",
     "//android_webview:common_crash_java",
     "//android_webview:common_java",
-    "//android_webview:common_metrics_java",
     "//android_webview:common_platform_services_java",
     "//base:base_java",
     "//components/minidump_uploader:minidump_uploader_java",
@@ -84,7 +86,6 @@ android_library("services_java") {
     "//android_webview:common_aidl_java",
     "//android_webview:common_crash_java",
     "//android_webview:common_java",
-    "//android_webview:common_metrics_java",
     "//android_webview:common_platform_services_java",
     "//android_webview:common_variations_java",
     "//android_webview/proto:metrics_bridge_records_proto_java",

android_webview/java/src/org/chromium/android_webview/common/metrics/AwNonembeddedUmaRecorder.java → android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/AwNonembeddedUmaRecorder.java

@@ -1,7 +1,7 @@
 // Copyright 2020 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.android_webview.common.metrics;
+package org.chromium.android_webview.nonembedded;
 
 import android.content.ComponentName;
 import android.content.Context;

android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java

@@ -11,7 +11,6 @@
 
 import org.chromium.android_webview.AwLocaleConfig;
 import org.chromium.android_webview.common.CommandLineUtil;
-import org.chromium.android_webview.common.metrics.AwNonembeddedUmaRecorder;
 import org.chromium.android_webview.devui.util.WebViewPackageHelper;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;

android_webview/test/BUILD.gn

@@ -161,7 +161,6 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//android_webview:android_webview_java",
     "//android_webview:common_aidl_java",
     "//android_webview:common_crash_java",
-    "//android_webview:common_metrics_java",
     "//android_webview:common_platform_services_java",
     "//android_webview:common_variations_java",
     "//android_webview/nonembedded:devui_java",
@@ -302,8 +301,8 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
     "../javatests/src/org/chromium/android_webview/test/common/crash/CrashInfoEqualityMatcher.java",
     "../javatests/src/org/chromium/android_webview/test/common/crash/CrashInfoTest.java",
-    "../javatests/src/org/chromium/android_webview/test/common/metrics/AwNonembeddedUmaRecorderTest.java",
     "../javatests/src/org/chromium/android_webview/test/common/variations/VariationsUtilsTest.java",
+    "../javatests/src/org/chromium/android_webview/test/devui/AwNonembeddedUmaRecorderTest.java",
     "../javatests/src/org/chromium/android_webview/test/devui/DeveloperUiTest.java",
     "../javatests/src/org/chromium/android_webview/test/devui/util/CrashBugUrlFactoryTest.java",
     "../javatests/src/org/chromium/android_webview/test/devui/util/UnuploadedFilesStateLoaderTest.java",
@@ -475,13 +474,12 @@ junit_binary("android_webview_junit_tests") {
     "../junit/src/org/chromium/android_webview/robolectric/AwScrollOffsetManagerTest.java",
     "../junit/src/org/chromium/android_webview/robolectric/FindAddressTest.java",
     "../junit/src/org/chromium/android_webview/robolectric/common/FlagOverrideHelperTest.java",
-    "../junit/src/org/chromium/android_webview/robolectric/common/metrics/AwNonembeddedUmaReplayerTest.java",
     "../junit/src/org/chromium/android_webview/robolectric/common/services/ServiceNamesTest.java",
+    "../junit/src/org/chromium/android_webview/robolectric/metrics/AwNonembeddedUmaReplayerTest.java",
   ]
 
   deps = [
     "//android_webview:android_webview_java",
-    "//android_webview:common_metrics_java",
     "//android_webview/nonembedded:services_java",
     "//android_webview/proto:metrics_bridge_records_proto_java",
     "//base:base_java",