Replace aw_version_info_values with components's version_info

Components's version_info caontain all version informations,
The aw_version_info_values will be redundant.

Bug: 
Change-Id: If1182861a8bdc0c29b370ee70ab4868046238312
Reviewed-on: https://chromium-review.googlesource.com/711819Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#508595}

android_webview/BUILD.gn

@@ -675,7 +675,6 @@ source_set("common") {
     ":generate_components_strings",
     ":native_jni",
     "//android_webview:generate_components_strings",
-    "//android_webview/common:version",
     "//base",
     "//base/third_party/dynamic_annotations:dynamic_annotations",
     "//components/autofill/android:provider",

android_webview/browser/aw_contents_statics.cc

@@ -9,13 +9,13 @@
 #include "android_webview/browser/aw_safe_browsing_config_helper.h"
 #include "android_webview/browser/aw_safe_browsing_whitelist_manager.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
-#include "android_webview/common/aw_version_info_values.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/security_interstitials/core/urls.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
@@ -88,7 +88,8 @@ ScopedJavaLocalRef<jstring> GetUnreachableWebDataUrl(
 // static
 ScopedJavaLocalRef<jstring> GetProductVersion(JNIEnv* env,
                                               const JavaParamRef<jclass>&) {
-  return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION);
+  return base::android::ConvertUTF8ToJavaString(
+      env, version_info::GetVersionNumber());
 }
 
 // static

android_webview/browser/aw_metrics_service_client.cc

@@ -6,7 +6,6 @@
 
 #include "android_webview/browser/aw_metrics_log_uploader.h"
 #include "android_webview/common/aw_switches.h"
-#include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/jni/AwMetricsServiceClient_jni.h"
 #include "base/android/build_info.h"
 #include "base/android/jni_string.h"
@@ -252,7 +251,7 @@ metrics::SystemProfileProto::Channel AwMetricsServiceClient::GetChannel() {
 }
 
 std::string AwMetricsServiceClient::GetVersionString() {
-  return PRODUCT_VERSION;
+  return version_info::GetVersionNumber();
 }
 
 void AwMetricsServiceClient::CollectFinalMetricsForLog(

android_webview/common/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("//build/util/process_version.gni")
-
-process_version("version") {
-  sources = [
-    "//chrome/VERSION",
-  ]
-  template_file = "aw_version_info_values.h.version"
-  output = "$root_gen_dir/android_webview/common/aw_version_info_values.h"
-}

android_webview/common/aw_content_client.cc

@@ -6,11 +6,11 @@
 
 #include "android_webview/common/aw_media_drm_bridge_client.h"
 #include "android_webview/common/aw_resource.h"
-#include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
 #include "android_webview/common/url_constants.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
+#include "components/version_info/version_info.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
 #include "gpu/config/gpu_info.h"
@@ -22,7 +22,7 @@
 namespace android_webview {
 
 std::string GetProduct() {
-  return "Chrome/" PRODUCT_VERSION;
+  return version_info::GetProductNameAndVersionForUserAgent();
 }
 
 std::string GetUserAgent() {

android_webview/common/aw_version_info_values.h.version

-// Copyright (c) 2014 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.
-
-#ifndef ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
-#define ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
-
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
-
-#endif  // ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_

android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc

@@ -8,7 +8,6 @@
 
 #include "android_webview/common/aw_descriptors.h"
 #include "android_webview/common/aw_paths.h"
-#include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
 #include "base/android/build_info.h"
 #include "base/base_paths_android.h"
@@ -23,6 +22,7 @@
 #include "build/build_config.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/app/crash_reporter_client.h"
+#include "components/version_info/version_info_values.h"
 #include "content/public/common/content_switches.h"
 
 namespace android_webview {

android_webview/lib/webview_jni_onload.cc

@@ -4,9 +4,9 @@
 
 #include "android_webview/lib/webview_jni_onload.h"
 
-#include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/lib/aw_main_delegate.h"
 #include "base/android/library_loader/library_loader_hooks.h"
+#include "components/version_info/version_info_values.h"
 #include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
 #include "url/url_util.h"