diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 18:40:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 18:40:55 +0000 |
| commit | ad74a59d383e658187ae48d084c7a65145d84449 (patch) | |
| tree | a60b8e2f9abf54efab891fcb589c7c865ecc7a17 /net/test | |
| parent | 9cf72aecda4f6c4279cbe397e6c133bbebb8c642 (diff) | |
| download | chromium_src-ad74a59d383e658187ae48d084c7a65145d84449.zip chromium_src-ad74a59d383e658187ae48d084c7a65145d84449.tar.gz chromium_src-ad74a59d383e658187ae48d084c7a65145d84449.tar.bz2 | |
More net/ reordering.
In addition to the normal method reordering, this patch also deinlines
net/base/test_completion_callback.h and places the compiled code in the
net_test_support target. Minimization of that header also required adding
includes in a few unit tests.
BUG=68682
TEST=compiles
Review URL: http://codereview.chromium.org/6341004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 1 | ||||
| -rw-r--r-- | net/test/test_server.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 9722dc1..14da7f4 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -28,6 +28,7 @@ #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" +#include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/base/test_root_certs.h" #include "net/socket/tcp_client_socket.h" diff --git a/net/test/test_server.h b/net/test/test_server.h index 6d93fc8..c83b284 100644 --- a/net/test/test_server.h +++ b/net/test/test_server.h @@ -35,6 +35,8 @@ class AddressList; // that can provide various responses useful for testing. class TestServer { public: + typedef std::pair<std::string, std::string> StringPair; + enum Type { TYPE_FTP, TYPE_HTTP, @@ -126,7 +128,6 @@ class TestServer { const std::string& user, const std::string& password) const; - typedef std::pair<std::string, std::string> StringPair; static bool GetFilePathWithReplacements( const std::string& original_path, const std::vector<StringPair>& text_to_replace, |