diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 19:45:41 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 19:45:41 +0000 |
commit | f6c21cb31f1b7bd4e8873a55e9954eece1fddda5 (patch) | |
tree | 6430a3c5eff0decfd793e7912e5e5fe7bb04a838 /chrome/browser/io_thread.cc | |
parent | 64cd5c20952c3ae6ebb83a9ea3760795f5c5c0dc (diff) | |
download | chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.zip chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.tar.gz chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.tar.bz2 |
Reland r74842
Merged correctly this time.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6523067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r-- | chrome/browser/io_thread.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index c6b8c7b..16eec12 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -29,6 +29,7 @@ #include "chrome/common/net/url_fetcher.h" #include "chrome/common/pref_names.h" #include "net/base/cert_verifier.h" +#include "net/base/cookie_monster.h" #include "net/base/dnsrr_resolver.h" #include "net/base/host_cache.h" #include "net/base/host_resolver.h" |