Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: net/proxy/proxy_config_service_win.cc

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/proxy/proxy_config_service_win.h" 5 #include "net/proxy/proxy_config_service_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <winhttp.h> 8 #include <winhttp.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/string_tokenizer.h" 12 #include "base/string_tokenizer.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/stl_util-inl.h" 14 #include "base/stl_util.h"
15 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
16 #include "base/win/registry.h" 16 #include "base/win/registry.h"
17 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
18 #include "net/proxy/proxy_config.h" 18 #include "net/proxy/proxy_config.h"
19 19
20 #pragma comment(lib, "winhttp.lib") 20 #pragma comment(lib, "winhttp.lib")
21 21
22 namespace net { 22 namespace net {
23 23
24 namespace { 24 namespace {
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 while (proxy_server_bypass_list.GetNext()) { 183 while (proxy_server_bypass_list.GetNext()) {
184 std::string bypass_url_domain = proxy_server_bypass_list.token(); 184 std::string bypass_url_domain = proxy_server_bypass_list.token();
185 config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain); 185 config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
186 } 186 }
187 } 187 }
188 if (ie_config.lpszAutoConfigUrl) 188 if (ie_config.lpszAutoConfigUrl)
189 config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl)); 189 config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl));
190 } 190 }
191 191
192 } // namespace net 192 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698