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

chrome/browser/ui/webui/version_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/version_ui.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 26 matching lines @@
 #endif
 
 namespace {
 
 content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
   content::WebUIDataSource* html_source =
       content::WebUIDataSource::Create(chrome::kChromeUIVersionHost);
 
   // 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",
                          chrome::VersionInfo::GetVersionStringModifier());
   html_source->AddLocalizedString("os_name", IDS_ABOUT_VERSION_OS);
   html_source->AddLocalizedString("platform", IDS_PLATFORM_LABEL);
   html_source->AddString("os_type", version_info.OSType());
   html_source->AddString("blink_version", content::GetWebKitVersion());
   html_source->AddString("js_engine", "V8");
   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
   // VersionHandler::OnGotPlugins. The area is initially blank.
   html_source->AddString("flash_version", std::string());
 #endif  // defined(OS_ANDROID)
 
   html_source->AddLocalizedString("company", IDS_ABOUT_VERSION_COMPANY_NAME);
   base::Time::Exploded exploded_time;
   base::Time::Now().LocalExplode(&exploded_time);
@@ skipping 64 matching lines @@
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   content::WebUIDataSource::Add(profile, CreateVersionUIDataSource(profile));
 }
 
 VersionUI::~VersionUI() {
 }