Cleanup VersionInfo after componentization.

chrome/chrome_common.gypi

Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index c04acc9a03d652c9fca30ea375a55eab7154bf39..c9e5ea17db2d935489fe5ce1bdb5cad697545b30 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -12,6 +12,13 @@
       'common/auto_start_linux.h',
       'common/badge_util.cc',
       'common/badge_util.h',
+      'common/channel_info.cc',
+      'common/channel_info.h',
+      'common/channel_info_android.cc',
+      'common/channel_info_chromeos.cc',
+      'common/channel_info_mac.mm',
+      'common/channel_info_posix.cc',
+      'common/channel_info_win.cc',
       'common/child_process_logging.h',
       'common/child_process_logging_win.cc',
       'common/chrome_content_client.cc',
@@ -21,13 +28,6 @@
       'common/chrome_result_codes.h',
       'common/chrome_utility_messages.h',
       'common/chrome_utility_printing_messages.h',
-      'common/chrome_version_info.cc',
-      'common/chrome_version_info.h',
-      'common/chrome_version_info_android.cc',
-      'common/chrome_version_info_chromeos.cc',
-      'common/chrome_version_info_mac.mm',
-      'common/chrome_version_info_posix.cc',
-      'common/chrome_version_info_win.cc',
       'common/cloud_print/cloud_print_cdd_conversion.cc',
       'common/cloud_print/cloud_print_cdd_conversion.h',
       'common/cloud_print/cloud_print_class_mac.h',
@@ -495,7 +495,7 @@
         ['OS=="android"', {
           'sources!': [
             'common/badge_util.cc',
-            'common/chrome_version_info_posix.cc',
+            'common/channel_info_posix.cc',
             'common/extensions/api/spellcheck/spellcheck_handler.cc',
             'common/extensions/manifest_handlers/extension_action_handler.cc',
             'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
@@ -530,7 +530,7 @@
             '<(DEPTH)/breakpad/src',
           ],
           'sources!': [
-            'common/chrome_version_info_posix.cc',
+            'common/channel_info_posix.cc',
           ],
         }],
         ['enable_webrtc==0', {