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

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

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and revert nss_ocsp.cc changes Created 7 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
« no previous file with comments | « net/proxy/proxy_script_decider.h ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_service.h" 5 #include "net/proxy/proxy_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/message_loop/message_loop_proxy.h" 15 #include "base/message_loop/message_loop_proxy.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/thread_task_runner_handle.h" 17 #include "base/thread_task_runner_handle.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "googleurl/src/gurl.h"
20 #include "net/base/completion_callback.h" 19 #include "net/base/completion_callback.h"
21 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
22 #include "net/base/net_log.h" 21 #include "net/base/net_log.h"
23 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
24 #include "net/proxy/dhcp_proxy_script_fetcher.h" 23 #include "net/proxy/dhcp_proxy_script_fetcher.h"
25 #include "net/proxy/multi_threaded_proxy_resolver.h" 24 #include "net/proxy/multi_threaded_proxy_resolver.h"
26 #include "net/proxy/network_delegate_error_observer.h" 25 #include "net/proxy/network_delegate_error_observer.h"
27 #include "net/proxy/proxy_config_service_fixed.h" 26 #include "net/proxy/proxy_config_service_fixed.h"
28 #include "net/proxy/proxy_resolver.h" 27 #include "net/proxy/proxy_resolver.h"
29 #include "net/proxy/proxy_script_decider.h" 28 #include "net/proxy/proxy_script_decider.h"
30 #include "net/proxy/proxy_script_fetcher.h" 29 #include "net/proxy/proxy_script_fetcher.h"
31 #include "net/url_request/url_request_context.h" 30 #include "net/url_request/url_request_context.h"
31 #include "url/gurl.h"
32 32
33 #if defined(OS_WIN) 33 #if defined(OS_WIN)
34 #include "net/proxy/proxy_config_service_win.h" 34 #include "net/proxy/proxy_config_service_win.h"
35 #include "net/proxy/proxy_resolver_winhttp.h" 35 #include "net/proxy/proxy_resolver_winhttp.h"
36 #elif defined(OS_IOS) 36 #elif defined(OS_IOS)
37 #include "net/proxy/proxy_config_service_ios.h" 37 #include "net/proxy/proxy_config_service_ios.h"
38 #include "net/proxy/proxy_resolver_mac.h" 38 #include "net/proxy/proxy_resolver_mac.h"
39 #elif defined(OS_MACOSX) 39 #elif defined(OS_MACOSX)
40 #include "net/proxy/proxy_config_service_mac.h" 40 #include "net/proxy/proxy_config_service_mac.h"
41 #include "net/proxy/proxy_resolver_mac.h" 41 #include "net/proxy/proxy_resolver_mac.h"
(...skipping 1525 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 OnCompletion(result_); 1567 OnCompletion(result_);
1568 } 1568 }
1569 } 1569 }
1570 1570
1571 void SyncProxyServiceHelper::OnCompletion(int rv) { 1571 void SyncProxyServiceHelper::OnCompletion(int rv) {
1572 result_ = rv; 1572 result_ = rv;
1573 event_.Signal(); 1573 event_.Signal();
1574 } 1574 }
1575 1575
1576 } // namespace net 1576 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_script_decider.h ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698