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

android_webview/BUILD.gn

 # 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.
 
 import("//android_webview/system_webview_apk_tmpl.gni")
 import("//android_webview/webview_repack_locales.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
@@ skipping 467 matching lines @@
     "browser/aw_javascript_dialog_manager.cc",
     "browser/aw_javascript_dialog_manager.h",
     "browser/aw_login_delegate.cc",
     "browser/aw_login_delegate.h",
     "browser/aw_media_url_interceptor.cc",
     "browser/aw_media_url_interceptor.h",
     "browser/aw_metrics_log_uploader.cc",
     "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",
     "browser/aw_permission_manager.h",
     "browser/aw_picture.cc",
     "browser/aw_picture.h",
     "browser/aw_print_manager.cc",
     "browser/aw_print_manager.h",
     "browser/aw_printing_message_filter.cc",
     "browser/aw_printing_message_filter.h",
     "browser/aw_quota_manager_bridge.cc",
     "browser/aw_quota_manager_bridge.h",
     "browser/aw_quota_manager_bridge_impl.cc",
     "browser/aw_quota_manager_bridge_impl.h",
     "browser/aw_quota_permission_context.cc",
     "browser/aw_quota_permission_context.h",
     "browser/aw_render_process_gone_delegate.h",
     "browser/aw_render_thread_context_provider.cc",
     "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",
     "browser/aw_safe_browsing_blocking_page.cc",
     "browser/aw_safe_browsing_blocking_page.h",
     "browser/aw_safe_browsing_config_helper.cc",
     "browser/aw_safe_browsing_config_helper.h",
     "browser/aw_safe_browsing_resource_throttle.cc",
     "browser/aw_safe_browsing_resource_throttle.h",
     "browser/aw_safe_browsing_ui_manager.cc",
@@ skipping 51 matching lines @@
     "browser/net/aw_network_delegate.h",
     "browser/net/aw_request_interceptor.cc",
     "browser/net/aw_request_interceptor.h",
     "browser/net/aw_url_request_context_getter.cc",
     "browser/net/aw_url_request_context_getter.h",
     "browser/net/aw_url_request_job_factory.cc",
     "browser/net/aw_url_request_job_factory.h",
     "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",
     "browser/net/token_binding_manager.cc",
     "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",
     "browser/parent_output_surface.h",
     "browser/permission/aw_permission_request.cc",
     "browser/permission/aw_permission_request.h",
     "browser/permission/aw_permission_request_delegate.cc",
     "browser/permission/aw_permission_request_delegate.h",
     "browser/permission/media_access_permission_request.cc",
     "browser/permission/media_access_permission_request.h",
@@ skipping 28 matching lines @@
     "common/android_webview_message_generator.h",
     "common/aw_content_client.cc",
     "common/aw_content_client.h",
     "common/aw_descriptors.h",
     "common/aw_hit_test_data.cc",
     "common/aw_hit_test_data.h",
     "common/aw_media_drm_bridge_client.cc",
     "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",
     "common/crash_reporter/aw_microdump_crash_reporter.cc",
     "common/crash_reporter/aw_microdump_crash_reporter.h",
     "common/crash_reporter/crash_keys.cc",
     "common/crash_reporter/crash_keys.h",
     "common/devtools_instrumentation.h",
     "common/render_view_messages.cc",
     "common/render_view_messages.h",
@@ skipping 307 matching lines @@
   system_webview_apk_tmpl("system_webview_apk") {
     android_manifest = system_webview_android_manifest
     android_manifest_dep = ":system_webview_manifest"
     deps = [
       ":system_webview_resources",
       "//android_webview/glue",
     ]
     apk_name = "SystemWebView"
   }
 }