| Index: net/base/mock_host_resolver.cc
|
| diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
|
| index 87cb4081a9a7f7614866662a0be489a68b3f6dd8..539b44ec9c2dc99c53e7190738b2d01b33e33e42 100644
|
| --- a/net/base/mock_host_resolver.cc
|
| +++ b/net/base/mock_host_resolver.cc
|
| @@ -78,11 +78,8 @@ int MockHostResolverBase::Resolve(const RequestInfo& info,
|
| const BoundNetLog& net_log) {
|
| DCHECK(CalledOnValidThread());
|
| size_t id = next_request_id_++;
|
| - FOR_EACH_OBSERVER(Observer, observers_, OnStartResolution(id, info));
|
| int rv = ResolveFromIPLiteralOrCache(info, addresses);
|
| if (rv != ERR_DNS_CACHE_MISS) {
|
| - FOR_EACH_OBSERVER(Observer, observers_,
|
| - OnFinishResolutionWithStatus(id, rv == OK, info));
|
| return rv;
|
| }
|
| if (synchronous_mode_) {
|
| @@ -104,11 +101,8 @@ int MockHostResolverBase::ResolveFromCache(const RequestInfo& info,
|
| AddressList* addresses,
|
| const BoundNetLog& net_log) {
|
| DCHECK(CalledOnValidThread());
|
| - size_t id = next_request_id_++;
|
| - FOR_EACH_OBSERVER(Observer, observers_, OnStartResolution(id, info));
|
| + next_request_id_++;
|
| int rv = ResolveFromIPLiteralOrCache(info, addresses);
|
| - FOR_EACH_OBSERVER(Observer, observers_,
|
| - OnFinishResolutionWithStatus(id, rv == OK, info));
|
| return rv;
|
| }
|
|
|
| @@ -119,20 +113,9 @@ void MockHostResolverBase::CancelRequest(RequestHandle handle) {
|
| if (it != requests_.end()) {
|
| scoped_ptr<Request> req(it->second);
|
| requests_.erase(it);
|
| - FOR_EACH_OBSERVER(Observer, observers_, OnCancelResolution(id, req->info));
|
| }
|
| }
|
|
|
| -void MockHostResolverBase::AddObserver(Observer* observer) {
|
| - DCHECK(CalledOnValidThread());
|
| - observers_.AddObserver(observer);
|
| -}
|
| -
|
| -void MockHostResolverBase::RemoveObserver(Observer* observer) {
|
| - DCHECK(CalledOnValidThread());
|
| - observers_.RemoveObserver(observer);
|
| -}
|
| -
|
| HostCache* MockHostResolverBase::GetHostCache() {
|
| return cache_.get();
|
| }
|
| @@ -192,8 +175,6 @@ int MockHostResolverBase::ResolveProc(size_t id,
|
| }
|
| if (rv == OK)
|
| *addresses = CreateAddressListUsingPort(addr, info.port());
|
| - FOR_EACH_OBSERVER(Observer, observers_,
|
| - OnFinishResolutionWithStatus(id, rv == OK, info));
|
| return rv;
|
| }
|
|
|
|
|