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

Side by Side Diff: chrome/browser/policy/cloud/device_management_service.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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) 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 "chrome/browser/policy/cloud/device_management_service.h" 5 #include "chrome/browser/policy/cloud/device_management_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/net/basic_http_user_agent_settings.h" 16 #include "chrome/browser/net/basic_http_user_agent_settings.h"
17 #include "chrome/browser/net/chrome_net_log.h" 17 #include "chrome/browser/net/chrome_net_log.h"
18 #include "chrome/common/chrome_version_info.h" 18 #include "chrome/common/chrome_version_info.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "content/public/common/content_client.h" 20 #include "content/public/common/content_client.h"
21 #include "googleurl/src/gurl.h" 21 #include "googleurl/src/gurl.h"
22 #include "net/base/escape.h" 22 #include "net/base/escape.h"
23 #include "net/base/host_resolver.h"
24 #include "net/base/load_flags.h" 23 #include "net/base/load_flags.h"
25 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
26 #include "net/cookies/cookie_monster.h" 25 #include "net/cookies/cookie_monster.h"
26 #include "net/dns/host_resolver.h"
27 #include "net/http/http_network_layer.h" 27 #include "net/http/http_network_layer.h"
28 #include "net/http/http_response_headers.h" 28 #include "net/http/http_response_headers.h"
29 #include "net/proxy/proxy_service.h" 29 #include "net/proxy/proxy_service.h"
30 #include "net/ssl/ssl_config_service_defaults.h" 30 #include "net/ssl/ssl_config_service_defaults.h"
31 #include "net/url_request/url_fetcher.h" 31 #include "net/url_request/url_fetcher.h"
32 #include "net/url_request/url_request_context.h" 32 #include "net/url_request/url_request_context.h"
33 #include "net/url_request/url_request_context_getter.h" 33 #include "net/url_request/url_request_context_getter.h"
34 #include "net/url_request/url_request_status.h" 34 #include "net/url_request/url_request_status.h"
35 35
36 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 } 641 }
642 } 642 }
643 643
644 const JobQueue::iterator elem = 644 const JobQueue::iterator elem =
645 std::find(queued_jobs_.begin(), queued_jobs_.end(), job); 645 std::find(queued_jobs_.begin(), queued_jobs_.end(), job);
646 if (elem != queued_jobs_.end()) 646 if (elem != queued_jobs_.end())
647 queued_jobs_.erase(elem); 647 queued_jobs_.erase(elem);
648 } 648 }
649 649
650 } // namespace policy 650 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698