diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-18 16:28:38 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-18 16:28:38 +0000 |
| commit | 71fdf77a393f95290a872bb3916f21c0bf2b4dbc (patch) | |
| tree | 71a91ce2cea378cf20078b8e2bda1f4dae448c14 /chrome/browser/chromeos/proxy_config_service_impl_unittest.cc | |
| parent | 59ff8e175196db57aff8223a6385821d18e55fd9 (diff) | |
| download | chromium_src-71fdf77a393f95290a872bb3916f21c0bf2b4dbc.zip chromium_src-71fdf77a393f95290a872bb3916f21c0bf2b4dbc.tar.gz chromium_src-71fdf77a393f95290a872bb3916f21c0bf2b4dbc.tar.bz2 | |
Fix race condition in ChromeProxyConfigService
The ChromeProxyConfigService was initialized to CONFIG_UNSET (i.e. effectively
a fallback to the system configuration) until the UI thread reported the
preference stored in the PrefService. This created a race condition during
startup where restored tabs could send requests while the
ChromeProxyConfigService was not configured with the values from the
PrefService, yet.
BUG=107326
TEST=no
Review URL: http://codereview.chromium.org/8951012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl_unittest.cc')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index 0eb9462..6a9aa50 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -241,7 +241,7 @@ class ProxyConfigServiceImplTestBase : public TESTBASE { DBusThreadManager::Initialize(); PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service); ProxyConfigServiceImpl::RegisterPrefs(pref_service); - proxy_config_service_.reset(new ChromeProxyConfigService(NULL)); + proxy_config_service_.reset(new ChromeProxyConfigService(NULL, true)); config_service_impl_.reset(new ProxyConfigServiceImpl(pref_service)); config_service_impl_->SetChromeProxyConfigService( proxy_config_service_.get()); |