Broke ARM compile.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 1044 matching lines @@
         'browser/favicon_helper.h',
         'browser/favicon_service.cc',
         'browser/favicon_service.h',
         'browser/file_select_helper.cc',
         'browser/file_select_helper.h',
         'browser/first_run/first_run.cc',
         'browser/first_run/first_run.h',
         'browser/first_run/first_run_gtk.cc',
         'browser/first_run/first_run_mac.mm',
         'browser/first_run/first_run_win.cc',
-        'browser/first_run/upgrade_util.cc',
-        'browser/first_run/upgrade_util.h',
-        'browser/first_run/upgrade_util_linux.cc',
-        'browser/first_run/upgrade_util_win.cc',
+        'browser/first_run/upgrade.cc',
+        'browser/first_run/upgrade.h',
+        'browser/first_run/upgrade_gtk.cc',
+        'browser/first_run/upgrade_win.cc',
         'browser/first_run/try_chrome_dialog_view.cc',
         'browser/first_run/try_chrome_dialog_view.h',
         'browser/fullscreen.h',
         'browser/fullscreen_linux.cc',
         'browser/fullscreen_mac.mm',
         'browser/fullscreen_win.cc',
         'browser/geolocation/access_token_store.cc',
         'browser/geolocation/geolocation_content_settings_map.cc',
         'browser/geolocation/geolocation_content_settings_map.h',
         'browser/geolocation/geolocation_exceptions_table_model.cc',
@@ skipping 2332 matching lines @@
             ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'],
             ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.h'],
             ['exclude', 'browser/ui/webui/filebrowse_ui.cc'],
             ['exclude', 'browser/ui/webui/mediaplayer_ui.cc'],
             ['exclude', 'browser/ui/webui/slideshow_ui.cc'],
           ],
         }],
         ['chromeos==1', {
           'sources!': [
             'browser/background_mode_manager_linux.cc',
-            'browser/first_run/upgrade_util.cc',
-            'browser/first_run/upgrade_util.h',
+            'browser/first_run/upgrade.cc',
+            'browser/first_run/upgrade.h',
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',
             'browser/password_manager/native_backend_kwallet_x.cc',
             'browser/password_manager/native_backend_kwallet_x.h',
             'browser/platform_util_linux.cc',
           ],
         }],
         ['use_gconf==0', {
           'sources!': [
             'browser/ui/gtk/gconf_titlebar_listener.cc',
@@ skipping 47 matching lines @@
               # For dlsym() in 'browser/zygote_main_linux.cc'
               '-ldl',
             ],
           },
           'sources!': [
             'browser/ui/views/extensions/extension_view.cc',
             'browser/ui/views/extensions/extension_view.h',
           ],
           'sources': [
             'browser/crash_handler_host_linux.h',
-            'browser/first_run/upgrade_util.cc',
-            'browser/first_run/upgrade_util.h',
+            'browser/first_run/upgrade.cc',
+            'browser/first_run/upgrade.h',
           ],
           'conditions': [
             ['use_gnome_keyring==1', {
               'dependencies': [
                 '../build/linux/system.gyp:gnome-keyring',
               ],
             }],
             ['linux_breakpad==1', {
               'sources': [
                 'app/breakpad_linux.cc',
@@ skipping 43 matching lines @@
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
             '../build/linux/system.gyp:x11',
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
-            'browser/first_run/upgrade_util.cc',
-            'browser/first_run/upgrade_util.h',
+            'browser/first_run/upgrade.cc',
+            'browser/first_run/upgrade.h',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/jankometer.cc',
             'browser/password_manager/login_database_posix.cc',
             'browser/power_save_blocker_stub.cc',
             'browser/ui/browser_list_stub.cc',
             'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/tabs/dock_info.cc',
             'browser/ui/views/extensions/extension_view.cc',
             'browser/ui/views/extensions/extension_view.h',
@@ skipping 140 matching lines @@
           ],
           'direct_dependent_settings': {
             'link_settings': {
               'libraries': [
                 '-llocationapi.lib',
                 '-lsensorsapi.lib',
               ],
             }
           },
           'sources': [
-            'browser/first_run/upgrade_util.cc',
-            'browser/first_run/upgrade_util.h',
+            'browser/first_run/upgrade.cc',
+            'browser/first_run/upgrade.h',
             # Using built-in rule in vstudio for midl.
             'browser/history/history_indexer.idl',
             'browser/ui/webui/conflicts_ui.cc',
             'browser/ui/webui/conflicts_ui.h',
           ],
           'sources!': [
             'browser/history/history_publisher_none.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/power_save_blocker_stub.cc',
@@ skipping 716 matching lines @@
       'hard_dependency': 1,
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: