Clean up dns prefetch code, and also port it.

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/field_trial.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/browser_main_win.h"
 #include "chrome/browser/browser_init.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 20 matching lines @@
 
 #include "base/registry.h"
 #include "base/win_util.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/process_singleton.h"
-#include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/env_vars.h"
@@ skipping 17 matching lines @@
 #include "net_resources.h"
 #endif
 
 namespace Platform {
 
 void WillInitializeMainMessageLoop(const CommandLine & command_line);
 void WillTerminate();
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 // Perform any platform-specific work that needs to be done before the main
-// message loop is created and initialized. 
+// message loop is created and initialized.
 void WillInitializeMainMessageLoop(const CommandLine & command_line) {
 }
 
 // Perform platform-specific work that needs to be done after the main event
 // loop has ended.
 void WillTerminate() {
 }
 #endif
 
 }  // namespace Platform
@@ skipping 313 matching lines @@
   }
 
   // Sets things up so that if we crash from this point on, a dialog will
   // popup asking the user to restart chrome. It is done this late to avoid
   // testing against a bunch of special cases that are taken care early on.
   PrepareRestartOnCrashEnviroment(parsed_command_line);
 
 #if defined(OS_WIN)
   // Initialize Winsock.
   net::EnsureWinsockInit();
+#endif  // defined(OS_WIN)
 
   // Initialize the DNS prefetch system
   chrome_browser_net::DnsPrefetcherInit dns_prefetch_init(user_prefs);
   chrome_browser_net::DnsPrefetchHostNamesAtStartup(user_prefs, local_state);
   chrome_browser_net::RestoreSubresourceReferrers(local_state);
 
+#if defined(OS_WIN)
   // Init common control sex.
   INITCOMMONCONTROLSEX config;
   config.dwSize = sizeof(config);
   config.dwICC = ICC_WIN95_CLASSES;
   InitCommonControlsEx(&config);
 
   win_util::ScopedCOMInitializer com_initializer;
 
   // Init the RLZ library. This just binds the dll and schedules a task on the
   // file thread to be run sometime later. If this is the first run we record
@@ skipping 108 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;
 }