Cleanup a few FirstRun methods that are only applicable to Windows.

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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_main.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 332 matching lines @@
   // However, ProcessSingleton needs a real user_data_dir on Mac/Linux,
   // so it's better to fail here than fail mysteriously elsewhere.
   CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
       << "Must be able to get user data directory!";
 #endif
 
   ProcessSingleton process_singleton(user_data_dir);
 
   bool is_first_run = FirstRun::IsChromeFirstRun() ||
       parsed_command_line.HasSwitch(switches::kFirstRun);
-  bool first_run_ui_bypass = false;
 
   scoped_ptr<BrowserProcess> browser_process;
   if (parsed_command_line.HasSwitch(switches::kImport)) {
     // We use different BrowserProcess when importing so no GoogleURLTracker is
     // instantiated (as it makes a URLRequest and we don't have an IO thread,
     // see bug #1292702).
     browser_process.reset(new FirstRunBrowserProcess(parsed_command_line));
     is_first_run = false;
   } else {
     browser_process.reset(new BrowserProcessImpl(parsed_command_line));
@@ skipping 120 matching lines @@
         Upgrade::ShowTryChromeDialog(StringToInt(try_chrome));
     if (answer == Upgrade::TD_NOT_NOW)
       return ResultCodes::NORMAL_EXIT_EXP1;
     if (answer == Upgrade::TD_UNINSTALL_CHROME)
       return ResultCodes::NORMAL_EXIT_EXP2;
   }
 #endif  // OS_WIN
 
   BrowserInit browser_init;
 
+#if defined(OS_WIN)
   int rlz_ping_delay = 0;
+#endif
   bool homepage_defined = false;
   int import_items = 0;
   int dont_import_items = 0;
+  bool first_run_ui_bypass = false;
   if (is_first_run) {
+#if defined(OS_WIN)
     // On first run, we need to process the master preferences before the
     // browser's profile_manager object is created, but after ResourceBundle
     // is initialized.
     std::vector<std::wstring> first_run_tabs;
     first_run_ui_bypass = !FirstRun::ProcessMasterPreferences(user_data_dir,
         FilePath(), &first_run_tabs, &rlz_ping_delay, &homepage_defined,
         &import_items, &dont_import_items);
     // The master prefs might specify a set of urls to display.
     if (first_run_tabs.size())
       AddFirstRunNewTabs(&browser_init, first_run_tabs);
+#endif  // OS_WIN
 
     // If we are running in App mode, we do not want to show the importer
     // (first run) UI.
     if (!first_run_ui_bypass &&
         (parsed_command_line.HasSwitch(switches::kApp) ||
          parsed_command_line.HasSwitch(switches::kNoFirstRun))) {
       first_run_ui_bypass = true;
     }
   }
 
@@ skipping 112 matching lines @@
   } else if (parsed_command_line.HasSwitch(switches::kMakeDefaultBrowser)) {
     if (ShellIntegration::SetAsDefaultBrowser()) {
       return ResultCodes::NORMAL_EXIT;
     } else {
       return ResultCodes::SHELL_INTEGRATION_FAILED;
     }
   }
 
   // Importing other browser settings is done in a browser-like process
   // that exits when this task has finished.
+#if defined(OS_WIN)
   if (parsed_command_line.HasSwitch(switches::kImport))
     return FirstRun::ImportNow(profile, parsed_command_line);
+#endif
 
   // When another process is running, use it instead of starting us.
   switch (process_singleton.NotifyOtherProcess()) {
     case ProcessSingleton::PROCESS_NONE:
       // No process already running, fall through to starting a new one.
       break;
 
     case ProcessSingleton::PROCESS_NOTIFIED:
 #if defined(OS_LINUX)
       printf("%s\n", base::SysWideToNativeMB(
@@ skipping 239 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }