[WebView] Merge AwMetricsServiceClient and move few files to new place

android_webview/BUILD.gn

Index: android_webview/BUILD.gn
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index 2c5bfa3aa4d85c148cc9b0682b60df0089180778..436db6b680a271ef3133a4a5d8b9ba8de4bd3059 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -485,8 +485,6 @@ source_set("common") {
     "browser/aw_metrics_log_uploader.h",
     "browser/aw_metrics_service_client.cc",
     "browser/aw_metrics_service_client.h",
-    "browser/aw_metrics_service_client_impl.cc",
-    "browser/aw_metrics_service_client_impl.h",
     "browser/aw_pdf_exporter.cc",
     "browser/aw_pdf_exporter.h",
     "browser/aw_permission_manager.cc",
@@ -508,7 +506,6 @@ source_set("common") {
     "browser/aw_render_thread_context_provider.h",
     "browser/aw_renderer_priority_manager.cc",
     "browser/aw_renderer_priority_manager.h",
-    "browser/aw_resource.cc",
     "browser/aw_resource_context.cc",
     "browser/aw_resource_context.h",
     "browser/aw_result_codes.h",
@@ -580,6 +577,7 @@ source_set("common") {
     "browser/net/aw_web_resource_request.cc",
     "browser/net/aw_web_resource_request.h",
     "browser/net/aw_web_resource_response.h",
+    "browser/net/init_native_callback.cc",
     "browser/net/init_native_callback.h",
     "browser/net/input_stream_reader.cc",
     "browser/net/input_stream_reader.h",
@@ -587,7 +585,6 @@ source_set("common") {
     "browser/net/token_binding_manager.h",
     "browser/net_disk_cache_remover.cc",
     "browser/net_disk_cache_remover.h",
-    "browser/net_init_native_callback.cc",
     "browser/parent_compositor_draw_constraints.cc",
     "browser/parent_compositor_draw_constraints.h",
     "browser/parent_output_surface.cc",
@@ -636,6 +633,7 @@ source_set("common") {
     "common/aw_media_drm_bridge_client.h",
     "common/aw_paths.cc",
     "common/aw_paths.h",
+    "common/aw_resource.cc",
     "common/aw_resource.h",
     "common/aw_switches.cc",
     "common/aw_switches.h",