diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:15:28 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:15:28 +0000 |
| commit | a91e1409a1b702892be19b058ad418b92ab4dd28 (patch) | |
| tree | f65055a03ec7147674e921e80664be5bef9acef0 /net/url_request | |
| parent | 1ebe3cefbab03f450586895feea998f994ff13f8 (diff) | |
| download | chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.zip chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.gz chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.bz2 | |
Reland r52336.
(I accidentally committed a previous version of the patch (the fixed version
was in codereview since I had switched to my mac to address this exact compile
failure.)
BUG=none
TEST=none
TBR=evan
Review URL: http://codereview.chromium.org/2937010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request.h | 2 | ||||
| -rw-r--r-- | net/url_request/url_request_job.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 59aa9c4..7256ec0 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -10,12 +10,10 @@ #include <vector> #include "base/leak_tracker.h" -#include "base/linked_list.h" #include "base/linked_ptr.h" #include "base/logging.h" #include "base/non_thread_safe.h" #include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/load_states.h" #include "net/base/net_log.h" diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 486d8c0..4e737ba 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -4,6 +4,7 @@ #include "net/url_request/url_request_job.h" +#include "base/histogram.h" #include "base/message_loop.h" #include "base/string_util.h" #include "net/base/auth.h" |