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

Unified Diff: net/base/host_resolver.cc

Issue 6993015: Add unit-tests for SingleRequestHostResolver. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Try to re-upload cuz patch not applying on commit bot... Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/host_resolver.h ('k') | net/base/single_request_host_resolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/host_resolver.cc
===================================================================
--- net/base/host_resolver.cc (revision 87863)
+++ net/base/host_resolver.cc (working copy)
@@ -4,10 +4,6 @@
#include "net/base/host_resolver.h"
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "net/base/net_errors.h"
-
namespace net {
HostResolver::RequestInfo::RequestInfo(const HostPortPair& host_port_pair)
@@ -34,61 +30,4 @@
HostResolver::HostResolver() {
}
-SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver)
- : resolver_(resolver),
- cur_request_(NULL),
- cur_request_callback_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(
- callback_(this, &SingleRequestHostResolver::OnResolveCompletion)) {
- DCHECK(resolver_ != NULL);
-}
-
-SingleRequestHostResolver::~SingleRequestHostResolver() {
- Cancel();
-}
-
-int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info,
- AddressList* addresses,
- CompletionCallback* callback,
- const BoundNetLog& net_log) {
- DCHECK(!cur_request_ && !cur_request_callback_) << "resolver already in use";
-
- HostResolver::RequestHandle request = NULL;
-
- // We need to be notified of completion before |callback| is called, so that
- // we can clear out |cur_request_*|.
- CompletionCallback* transient_callback = callback ? &callback_ : NULL;
-
- int rv = resolver_->Resolve(
- info, addresses, transient_callback, &request, net_log);
-
- if (rv == ERR_IO_PENDING) {
- // Cleared in OnResolveCompletion().
- cur_request_ = request;
- cur_request_callback_ = callback;
- }
-
- return rv;
-}
-
-void SingleRequestHostResolver::Cancel() {
- if (cur_request_) {
- resolver_->CancelRequest(cur_request_);
- cur_request_ = NULL;
- }
-}
-
-void SingleRequestHostResolver::OnResolveCompletion(int result) {
- DCHECK(cur_request_ && cur_request_callback_);
-
- CompletionCallback* callback = cur_request_callback_;
-
- // Clear the outstanding request information.
- cur_request_ = NULL;
- cur_request_callback_ = NULL;
-
- // Call the user's original callback.
- callback->Run(result);
-}
-
} // namespace net
« no previous file with comments | « net/base/host_resolver.h ('k') | net/base/single_request_host_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698