diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 22:06:07 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 22:06:07 +0000 |
| commit | 15d53df08758ee3b35a08cd058b3b57bfddba227 (patch) | |
| tree | 72c17d4153ab18c58210bab0673a92e92f152415 /net/proxy | |
| parent | d7e9a8609d36bee7a8510dc95eec201ed44d37e0 (diff) | |
| download | chromium_src-15d53df08758ee3b35a08cd058b3b57bfddba227.zip chromium_src-15d53df08758ee3b35a08cd058b3b57bfddba227.tar.gz chromium_src-15d53df08758ee3b35a08cd058b3b57bfddba227.tar.bz2 | |
Revert 64960 - Turn on file access checks on Win.
BUG=60211
Review URL: http://codereview.chromium.org/4222005
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/4431001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config_service_win.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index 5aca4ae..d0a387f 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -12,7 +12,6 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stl_util-inl.h" -#include "base/thread_restrictions.h" #include "base/win/registry.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_config.h" @@ -73,9 +72,6 @@ ProxyConfigServiceWin::ProxyConfigServiceWin() } ProxyConfigServiceWin::~ProxyConfigServiceWin() { - // The registry functions below will end up going to disk. Do this on another - // thread to avoid slowing the IO thread. http://crbug.com/61453 - base::ThreadRestrictions::ScopedAllowIO allow_io; STLDeleteElements(&keys_to_watch_); } @@ -91,10 +87,6 @@ void ProxyConfigServiceWin::StartWatchingRegistryForChanges() { if (!keys_to_watch_.empty()) return; // Already initialized. - // The registry functions below will end up going to disk. Do this on another - // thread to avoid slowing the IO thread. http://crbug.com/61453 - base::ThreadRestrictions::ScopedAllowIO allow_io; - // There are a number of different places where proxy settings can live // in the registry. In some cases it appears in a binary value, in other // cases string values. Furthermore winhttp and wininet appear to have |