Move pe_image and registry from base to base/win and use the namespace. It re...

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/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.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 {
 
 const int kPollIntervalSec = 10;
@@ skipping 28 matching lines @@
 
   bool CreateRegKey(HKEY rootkey, const wchar_t* subkey) {
     return key_.Create(rootkey, subkey, KEY_NOTIFY);
   }
 
   HANDLE watch_event() const {
     return key_.watch_event();
   }
 
  private:
-  RegKey key_;
+  base::win::RegKey key_;
   base::ObjectWatcher watcher_;
 };
 
 ProxyConfigServiceWin::ProxyConfigServiceWin()
     : PollingProxyConfigService(
           base::TimeDelta::FromSeconds(kPollIntervalSec),
           &ProxyConfigServiceWin::GetCurrentProxyConfig) {
 }
 
 ProxyConfigServiceWin::~ProxyConfigServiceWin() {
@@ skipping 100 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