diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 04:16:25 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 04:16:25 +0000 |
| commit | 061efec5fa1af222d72b887feb5788260cb5248f (patch) | |
| tree | 83317a4b942609b17398cc74fa1caea172443683 /net/base/host_resolver_unittest.cc | |
| parent | 2aecf73871ce89098c0f2f6dd61d6adfe1f059ee (diff) | |
| download | chromium_src-061efec5fa1af222d72b887feb5788260cb5248f.zip chromium_src-061efec5fa1af222d72b887feb5788260cb5248f.tar.gz chromium_src-061efec5fa1af222d72b887feb5788260cb5248f.tar.bz2 | |
Re-land final subset of r18520.
The original code review that this belongs to is: <http://codereview.chromium.org/125171>. (BUG=14138)
The original was backed out because of a valgrind linux error (BUG=14218), so I relanded it in smaller chunks to see at which point problem happens.
This differs from the original, in that I have changed the unit-test to no longer use ScopedMapper + WaitingMapper, which I believe was the source of a race.
Review URL: http://codereview.chromium.org/125232
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver_unittest.cc')
| -rw-r--r-- | net/base/host_resolver_unittest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/base/host_resolver_unittest.cc b/net/base/host_resolver_unittest.cc index 41e7047..8fb0d16 100644 --- a/net/base/host_resolver_unittest.cc +++ b/net/base/host_resolver_unittest.cc @@ -823,10 +823,6 @@ TEST_F(HostResolverTest, Observers) { // (1) Delete the HostResolver while job is outstanding. // (2) Call HostResolver::CancelRequest() while a request is outstanding. TEST_F(HostResolverTest, CancellationObserver) { - // Set a blocking mapper so we control when the resolver thread finishes. - scoped_refptr<WaitingHostMapper> mapper = new WaitingHostMapper(); - ScopedHostMapper scoped_mapper(mapper.get()); - CapturingObserver observer; { // Create a host resolver and attach an observer. @@ -863,8 +859,7 @@ TEST_F(HostResolverTest, CancellationObserver) { EXPECT_TRUE(observer.cancel_log[0] == CapturingObserver::StartOrCancelEntry(0, info1)); - } -#if 0 + // Start an async request for (host2:60) net::HostResolver::RequestInfo info2("host2", 60); rv = host_resolver.Resolve(info2, &addrlist, &callback, NULL); @@ -892,9 +887,6 @@ TEST_F(HostResolverTest, CancellationObserver) { net::HostResolver::RequestInfo info("host2", 60); EXPECT_TRUE(observer.cancel_log[1] == CapturingObserver::StartOrCancelEntry(1, info)); -#endif - // Unblock the host mapper to let the worker threads finish. - mapper->Signal(); } } // namespace |