Add a command line flag to force all network traffic through a particular server.

The command line is:
  --fixed-server=host:port

When set, all traffic will be diverted through this server.  This is useful for
testing purposes with fixed servers.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/345034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30798 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index 998de32..9534e03 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -116,11 +116,13 @@ class HostResolver : public base::RefCountedThreadSafe<HostResolver> {
   //
   // When callback is null, the operation completes synchronously.
   //
-  // When callback is non-null, the operation will be performed asynchronously.
-  // ERR_IO_PENDING is returned if it has been scheduled successfully. Real
-  // result code will be passed to the completion callback. If |req| is
-  // non-NULL, then |*req| will be filled with a handle to the async request.
-  // This handle is not valid after the request has completed.
+  // When callback is non-null, the operation may be performed asynchronously.
+  // If the operation cannnot be completed synchronously, ERR_IO_PENDING will
+  // be returned and the real result code will be passed to the completion
+  // callback.  Otherwise the result code is returned immediately from this
+  // call.
+  // If |req| is non-NULL, then |*req| will be filled with a handle to the
+  // async request. This handle is not valid after the request has completed.
   //
   // Profiling information for the request is saved to |load_log| if non-NULL.
   virtual int Resolve(const RequestInfo& info,