| Index: net/base/host_resolver.h
|
| ===================================================================
|
| --- net/base/host_resolver.h (revision 26882)
|
| +++ net/base/host_resolver.h (working copy)
|
| @@ -26,7 +26,7 @@
|
| // request at a time is to create a SingleRequestHostResolver wrapper around
|
| // HostResolver (which will automatically cancel the single request when it
|
| // goes out of scope).
|
| -class HostResolver : public base::RefCounted<HostResolver> {
|
| +class HostResolver : public base::RefCountedThreadSafe<HostResolver> {
|
| public:
|
| // The parameters for doing a Resolve(). |hostname| and |port| are required,
|
| // the rest are optional (and have reasonable defaults).
|
|
|
| Property changes on: net\base\host_resolver.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/net/base/host_resolver.h:r69-2775
|
| Merged /trunk/src/net/base/host_resolver.h:r26476
|
|
|
|
|