summaryrefslogtreecommitdiffstats
path: root/net/base/mock_host_resolver.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 23:11:19 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 23:11:19 +0000
commit9b2331d912b0a15c3eef290eaa617c54a87dc68e (patch)
tree6ca5f0248ce754b74b39112c17c2d9726c004e79 /net/base/mock_host_resolver.cc
parent9f1e5d235d5bdb3a0fe626fe47f5468cddaf75e4 (diff)
downloadchromium_src-9b2331d912b0a15c3eef290eaa617c54a87dc68e.zip
chromium_src-9b2331d912b0a15c3eef290eaa617c54a87dc68e.tar.gz
chromium_src-9b2331d912b0a15c3eef290eaa617c54a87dc68e.tar.bz2
Reapply r61237: FBTF: Another big ctor/dtor cleanup found by automated tools.
Removes changes to code in webkit/ that broke chrome_frame. Will debug that portion later. (Shaves ~2MB off Linux Debug .a files) BUG=none TEST=compiles First Review URL: http://codereview.chromium.org/3563004 Review URL: http://codereview.chromium.org/3621003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mock_host_resolver.cc')
-rw-r--r--net/base/mock_host_resolver.cc25
1 files changed, 25 insertions, 0 deletions
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index a70c6aa..9c82f93 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -50,6 +50,8 @@ MockHostResolverBase::MockHostResolverBase(bool use_caching)
Reset(NULL);
}
+MockHostResolverBase::~MockHostResolverBase() {}
+
int MockHostResolverBase::Resolve(const RequestInfo& info,
AddressList* addresses,
CompletionCallback* callback,
@@ -258,6 +260,29 @@ int RuleBasedHostResolverProc::Resolve(const std::string& host,
//-----------------------------------------------------------------------------
+WaitingHostResolverProc::WaitingHostResolverProc(HostResolverProc* previous)
+ : HostResolverProc(previous), event_(false, false) {}
+
+void WaitingHostResolverProc::Signal() {
+ event_.Signal();
+}
+
+int WaitingHostResolverProc::Resolve(const std::string& host,
+ AddressFamily address_family,
+ HostResolverFlags host_resolver_flags,
+ AddressList* addrlist,
+ int* os_error) {
+ event_.Wait();
+ return ResolveUsingPrevious(host, address_family, host_resolver_flags,
+ addrlist, os_error);
+}
+
+WaitingHostResolverProc::~WaitingHostResolverProc() {}
+
+//-----------------------------------------------------------------------------
+
+ScopedDefaultHostResolverProc::ScopedDefaultHostResolverProc() {}
+
ScopedDefaultHostResolverProc::ScopedDefaultHostResolverProc(
HostResolverProc* proc) {
Init(proc);