OLD | NEW |
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/dns/single_request_host_resolver.h" | 5 #include "net/dns/single_request_host_resolver.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/profiler/scoped_tracker.h" |
11 #include "net/base/net_errors.h" | 12 #include "net/base/net_errors.h" |
12 | 13 |
13 namespace net { | 14 namespace net { |
14 | 15 |
15 SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver) | 16 SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver) |
16 : resolver_(resolver), | 17 : resolver_(resolver), |
17 cur_request_(NULL), | 18 cur_request_(NULL), |
18 callback_( | 19 callback_( |
19 base::Bind(&SingleRequestHostResolver::OnResolveCompletion, | 20 base::Bind(&SingleRequestHostResolver::OnResolveCompletion, |
20 base::Unretained(this))) { | 21 base::Unretained(this))) { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 57 |
57 void SingleRequestHostResolver::Cancel() { | 58 void SingleRequestHostResolver::Cancel() { |
58 if (!cur_request_callback_.is_null()) { | 59 if (!cur_request_callback_.is_null()) { |
59 resolver_->CancelRequest(cur_request_); | 60 resolver_->CancelRequest(cur_request_); |
60 cur_request_ = NULL; | 61 cur_request_ = NULL; |
61 cur_request_callback_.Reset(); | 62 cur_request_callback_.Reset(); |
62 } | 63 } |
63 } | 64 } |
64 | 65 |
65 void SingleRequestHostResolver::OnResolveCompletion(int result) { | 66 void SingleRequestHostResolver::OnResolveCompletion(int result) { |
| 67 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed. |
| 68 tracked_objects::ScopedTracker tracking_profile( |
| 69 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 70 "436634 SingleRequestHostResolver::OnResolveCompletion")); |
| 71 |
66 DCHECK(cur_request_); | 72 DCHECK(cur_request_); |
67 DCHECK_EQ(false, cur_request_callback_.is_null()); | 73 DCHECK_EQ(false, cur_request_callback_.is_null()); |
68 | 74 |
69 CompletionCallback callback = cur_request_callback_; | 75 CompletionCallback callback = cur_request_callback_; |
70 | 76 |
71 // Clear the outstanding request information. | 77 // Clear the outstanding request information. |
72 cur_request_ = NULL; | 78 cur_request_ = NULL; |
73 cur_request_callback_.Reset(); | 79 cur_request_callback_.Reset(); |
74 | 80 |
75 // Call the user's original callback. | 81 // Call the user's original callback. |
76 callback.Run(result); | 82 callback.Run(result); |
77 } | 83 } |
78 | 84 |
79 } // namespace net | 85 } // namespace net |
OLD | NEW |