Merge 88800 - Refactor UpgradeDetector.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 88800)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -718,6 +718,8 @@
         'browser/chromeos/tab_closeable_state_watcher.h',
         'browser/chromeos/update_observer.cc',
         'browser/chromeos/update_observer.h',
+        'browser/chromeos/upgrade_detector_chromeos.cc',
+        'browser/chromeos/upgrade_detector_chromeos.h',
         'browser/chromeos/user_cros_settings_provider.cc',
         'browser/chromeos/user_cros_settings_provider.h',
         'browser/chromeos/version_loader.cc',
@@ -3506,6 +3508,8 @@
         'browser/ui/window_snapshot/window_snapshot_x.cc',
         'browser/upgrade_detector.cc',
         'browser/upgrade_detector.h',
+        'browser/upgrade_detector_impl.cc',
+        'browser/upgrade_detector_impl.h',
         'browser/user_style_sheet_watcher.cc',
         'browser/user_style_sheet_watcher.h',
         'browser/utility_process_host.cc',
@@ -3612,6 +3616,8 @@
             'browser/password_manager/native_backend_kwallet_x.cc',
             'browser/password_manager/native_backend_kwallet_x.h',
             'browser/platform_util_linux.cc',
+            'browser/upgrade_detector_impl.cc',
+            'browser/upgrade_detector_impl.h',
           ],
         }],
         ['use_cups==1', {