Make Android about:version page more similar to other platforms.

Chrome for Android can use the same code for displaying the application
version on the about:version page as other platforms. There's no need to
special-case it.

Review URL: https://codereview.chromium.org/583003002

Cr-Commit-Position: refs/heads/master@{#295746}

chrome/app/generated_resources.grd

@@ -6917,11 +6917,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_ABOUT_VERSION_TITLE" desc="Title on the about:version page">
         About Version
       </message>
-      <if expr="is_android">
-        <message name="IDS_ABOUT_VERSION_APPLICATION" desc="label for the application on the about:version page">
-          Application
-        </message>
-      </if>
       <message name="IDS_ABOUT_VERSION_OFFICIAL" desc="official build on the about:version page">
         Official Build
       </message>

chrome/browser/resources/about_version.html

@@ -38,12 +38,6 @@ about:version template page
       <table id="inner" cellpadding="0" cellspacing="0" border="0">
         <tr><td class="label" i18n-content="application_label"></td>
           <td class="version" id="version">
-<if expr="is_android">
-            <span i18n-content="application_name"></span>
-            <span i18n-content="application_version_name"></span>
-            <span i18n-content="application_version_code"></span>
-</if>
-<if expr="not is_android">
             <span i18n-content="version"></span>
             (<span i18n-content="official"></span>)
             <span i18n-content="version_modifier"></span>
@@ -53,7 +47,6 @@ about:version template page
           <td class="label" i18n-content="revision"></td>
           <td class="version">
             <span i18n-content="cl"></span>
-</if>
           </td>
         </tr>
 <if expr="not chromeos">

chrome/browser/ui/webui/version_ui.cc

@@ -44,6 +44,7 @@ content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
 
   // Localized and data strings.
   html_source->AddLocalizedString("title", IDS_ABOUT_VERSION_TITLE);
+  html_source->AddLocalizedString("application_label", IDS_PRODUCT_NAME);
   chrome::VersionInfo version_info;
   html_source->AddString("version", version_info.Version());
   html_source->AddString("version_modifier",
@@ -56,22 +57,11 @@ content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
   html_source->AddString("js_version", v8::V8::GetVersion());
 
 #if defined(OS_ANDROID)
-  html_source->AddLocalizedString("application_label",
-                                  IDS_ABOUT_VERSION_APPLICATION);
   html_source->AddString("os_version", AndroidAboutAppInfo::GetOsInfo());
-  base::android::BuildInfo* android_build_info =
-      base::android::BuildInfo::GetInstance();
-  html_source->AddString("application_name",
-                         android_build_info->package_label());
-  html_source->AddString("application_version_name",
-                         android_build_info->package_version_name());
-  html_source->AddString("application_version_code",
-                         android_build_info->package_version_code());
   html_source->AddLocalizedString("build_id_name",
                                   IDS_ABOUT_VERSION_BUILD_ID);
   html_source->AddString("build_id", CHROME_BUILD_ID);
 #else
-  html_source->AddLocalizedString("application_label", IDS_PRODUCT_NAME);
   html_source->AddString("os_version", std::string());
   html_source->AddString("flash_plugin", "Flash");
   // Note that the Flash version is retrieve asynchronously and returned in