Broke ARM compile.

chrome/browser/browser_shutdown.cc

 // 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.
 
 #include "chrome/browser/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/first_run/upgrade_util.h"
+#include "chrome/browser/first_run/upgrade.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 146 matching lines @@
                                                         true);
 #endif
 
   // Uninstall Jank-O-Meter here after the IO thread is no longer running.
   UninstallJankometer();
 
   if (delete_resources_on_shutdown)
     ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_WIN)
-  if (!upgrade_util::IsBrowserAlreadyRunning() &&
+  if (!Upgrade::IsBrowserAlreadyRunning() &&
       shutdown_type_ != browser_shutdown::END_SESSION) {
-    upgrade_util::SwapNewChromeExeIfPresent();
+    Upgrade::SwapNewChromeExeIfPresent();
   }
 #endif
 
   if (restart_last_session) {
 #if !defined(OS_CHROMEOS)
     // Make sure to relaunch the browser with the original command line plus
     // the Restore Last Session flag. Note that Chrome can be launched (ie.
     // through ShellExecute on Windows) with a switch argument terminator at
     // the end (double dash, as described in b/1366444) plus a URL,
     // which prevents us from appending to the command line directly (issue
@@ skipping 13 matching lines @@
       if (!switch_value.empty())
         new_cl->AppendSwitchNative(i->first, i->second);
       else
         new_cl->AppendSwitch(i->first);
     }
     // Ensure restore last session is set.
     if (!new_cl->HasSwitch(switches::kRestoreLastSession))
       new_cl->AppendSwitch(switches::kRestoreLastSession);
 
 #if defined(OS_WIN) || defined(OS_LINUX)
-    upgrade_util::RelaunchChromeBrowser(*new_cl.get());
+    Upgrade::RelaunchChromeBrowser(*new_cl.get());
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
 #if defined(OS_MACOSX)
     new_cl->AppendSwitch(switches::kActivateOnLaunch);
     base::LaunchApp(*new_cl.get(), false, false, NULL);
 #endif  // defined(OS_MACOSX)
 
 #else
     NOTIMPLEMENTED();
 #endif  // !defined(OS_CHROMEOS)
@@ skipping 91 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown