diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
| commit | 5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b (patch) | |
| tree | 4df72d2d3125b017df6fd3286d331a5fcd8498a4 /net/server | |
| parent | 7f041050fd817116b78aa09227f511cc6505d7f3 (diff) | |
| download | chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.zip chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.gz chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.bz2 | |
Attempt four at landing the "histogram.h removed from message_loop.h" patch.
Previously committed as r52349 and r52336. Related commits: r52367, r52364
and r52343.
Rerunning trybots due to previous trybot breakage.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2965015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server')
| -rw-r--r-- | net/server/http_listen_socket.cc | 2 | ||||
| -rw-r--r-- | net/server/http_server_request_info.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/net/server/http_listen_socket.cc b/net/server/http_listen_socket.cc index 7711cd6..16c664e 100644 --- a/net/server/http_listen_socket.cc +++ b/net/server/http_listen_socket.cc @@ -8,6 +8,8 @@ #include <arpa/inet.h> #endif +#include <map> + #include "base/compiler_specific.h" #include "base/logging.h" #include "base/md5.h" diff --git a/net/server/http_server_request_info.h b/net/server/http_server_request_info.h index 64f0a78a..84f767f 100644 --- a/net/server/http_server_request_info.h +++ b/net/server/http_server_request_info.h @@ -6,6 +6,7 @@ #define NET_SERVER_HTTP_SERVER_REQUEST_INFO_H_ #include <string> +#include <map> #include "net/http/http_request_info.h" |