diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 18:23:25 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 18:23:25 +0000 |
| commit | 1933eb200c4bb16e4df535d779c98561f85c1e25 (patch) | |
| tree | 0ec1fe2dc176b2159abf8e33c53eaf940fb310c4 /chrome/browser/browser_prefs.cc | |
| parent | fd599eeeddf2a57a2b2d70e63725106ce93c4591 (diff) | |
| download | chromium_src-1933eb200c4bb16e4df535d779c98561f85c1e25.zip chromium_src-1933eb200c4bb16e4df535d779c98561f85c1e25.tar.gz chromium_src-1933eb200c4bb16e4df535d779c98561f85c1e25.tar.bz2 | |
Clean up dns prefetch code, and also port it.
- remove slave threads and use HostResolver in asynchronous mode instead (while still limiting number of concurrent lookups)
- make the implementation portable and make DnsMaster unit test compile and pass on Linux
- add more tests to DnsMaster unit test to simulate various shutdown scenarios, concurrent lookups, and to verify that we don't exceed our limit of concurrent lookup requests)
- remove some tests which relied on specifics of slaves' inner working
- adjust initialization and shutdown of dns prefetching (now it relies on the IO message loop being present)
Bonus: shutdown is almost instant now, no need to have a timeout.
BUG=5687, 6683
Review URL: http://codereview.chromium.org/15076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index fb39796..74aea18 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -9,6 +9,7 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/metrics/metrics_service.h" +#include "chrome/browser/net/dns_global.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" @@ -17,7 +18,6 @@ #include "chrome/browser/tab_contents/web_contents.h" #if defined(OS_WIN) // TODO(port): whittle this down as we port -#include "chrome/browser/net/dns_global.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" @@ -44,10 +44,10 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { MetricsLog::RegisterPrefs(local_state); MetricsService::RegisterPrefs(local_state); browser_shutdown::RegisterPrefs(local_state); + chrome_browser_net::RegisterPrefs(local_state); #if defined(OS_WIN) // TODO(port): whittle this down as we port BookmarkManagerView::RegisterPrefs(local_state); BrowserView::RegisterBrowserViewPrefs(local_state); - chrome_browser_net::RegisterPrefs(local_state); PageInfoWindow::RegisterPrefs(local_state); TaskManager::RegisterPrefs(local_state); ExternalProtocolHandler::RegisterPrefs(local_state); @@ -57,10 +57,10 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { SessionStartupPref::RegisterUserPrefs(user_prefs); Browser::RegisterUserPrefs(user_prefs); PasswordManager::RegisterUserPrefs(user_prefs); + chrome_browser_net::RegisterUserPrefs(user_prefs); #if defined(OS_WIN) // TODO(port): whittle this down as we port BookmarkBarView::RegisterUserPrefs(user_prefs); BookmarkTableView::RegisterUserPrefs(user_prefs); - chrome_browser_net::RegisterUserPrefs(user_prefs); DownloadManager::RegisterUserPrefs(user_prefs); SSLManager::RegisterUserPrefs(user_prefs); #endif |