diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 21:47:00 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 21:47:00 +0000 |
| commit | 3b543ab59106f2f889df2412766572836d408bd4 (patch) | |
| tree | 40a0dad0517dcad5b1738cf3df2e117e3ccc80fd /chrome/browser/io_thread.cc | |
| parent | 60fbffba562e633360f25b7a507d3bf1dedcb0e1 (diff) | |
| download | chromium_src-3b543ab59106f2f889df2412766572836d408bd4.zip chromium_src-3b543ab59106f2f889df2412766572836d408bd4.tar.gz chromium_src-3b543ab59106f2f889df2412766572836d408bd4.tar.bz2 | |
Moved SDCH initialization from UI thread to IO thread.
Removed enabling of SDCH per domain. Added -disable-sdch
to disable SDCH. SDCH is eanbled by default.
BUG=96455
TEST=network unit tests and sdch testing
R=jar
Review URL: http://codereview.chromium.org/7891069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index d0f3171..7439172 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -26,6 +26,7 @@ #include "chrome/browser/net/passive_log_collector.h" #include "chrome/browser/net/pref_proxy_config_service.h" #include "chrome/browser/net/proxy_service_factory.h" +#include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -43,6 +44,7 @@ #include "net/base/mapped_host_resolver.h" #include "net/base/net_util.h" #include "net/base/origin_bound_cert_service.h" +#include "net/base/sdch_manager.h" #include "net/dns/async_host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_filter.h" @@ -343,7 +345,9 @@ IOThread::IOThread( net_log_(net_log), extension_event_router_forwarder_(extension_event_router_forwarder), globals_(NULL), + sdch_manager_(new net::SdchManager()), ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { + sdch_manager_->set_sdch_fetcher(new SdchDictionaryFetcher); // We call RegisterPrefs() here (instead of inside browser_prefs.cc) to make // sure that everything is initialized in the right order. RegisterPrefs(local_state); @@ -367,6 +371,9 @@ IOThread::IOThread( } IOThread::~IOThread() { + delete sdch_manager_; + sdch_manager_ = NULL; + if (pref_proxy_config_tracker_) pref_proxy_config_tracker_->DetachFromPrefService(); // We cannot rely on our base class to stop the thread since we want our |