Revert 64960 - Turn on file access checks on Win....

net/proxy/proxy_config_service_win.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 "net/proxy/proxy_config_service_win.h"
 
 #include <windows.h>
 #include <winhttp.h>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #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"
 
 #pragma comment(lib, "winhttp.lib")
 
 namespace net {
 
 namespace {
 
@@ skipping 40 matching lines @@
   base::ObjectWatcher watcher_;
 };
 
 ProxyConfigServiceWin::ProxyConfigServiceWin()
     : PollingProxyConfigService(
           base::TimeDelta::FromSeconds(kPollIntervalSec),
           &ProxyConfigServiceWin::GetCurrentProxyConfig) {
 }
 
 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_);
 }
 
 void ProxyConfigServiceWin::AddObserver(Observer* observer) {
   // Lazily-initialize our registry watcher.
   StartWatchingRegistryForChanges();
 
   // Let the super-class do its work now.
   PollingProxyConfigService::AddObserver(observer);
 }
 
 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
   // separate stores, and proxy settings can be configured per-machine
   // or per-user.
   //
   // This function is probably not exhaustive in the registry locations it
   // watches for changes, however it should catch the majority of the
   // cases. In case we have missed some less common triggers (likely), we
   // will catch them during the periodic (10 second) polling, so things
@@ skipping 75 matching lines @@
     while (proxy_server_bypass_list.GetNext()) {
       std::string bypass_url_domain = proxy_server_bypass_list.token();
       config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
     }
   }
   if (ie_config.lpszAutoConfigUrl)
     config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl));
 }
 
 }  // namespace net