diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 03:03:00 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 03:03:00 +0000 |
| commit | 6622841e538bf238303988e46b32e43ae166a8d1 (patch) | |
| tree | c1de27bebdbb253f1f8bde278473068c6f319fda | |
| parent | f768655c72cb93e263763f23b3238acd04ac2a19 (diff) | |
| download | chromium_src-6622841e538bf238303988e46b32e43ae166a8d1.zip chromium_src-6622841e538bf238303988e46b32e43ae166a8d1.tar.gz chromium_src-6622841e538bf238303988e46b32e43ae166a8d1.tar.bz2 | |
Revert 113085 - broke unittests
Move CapturingNetLog out of net project, as it's no longer
used except in tests.
Review URL: http://codereview.chromium.org/8567011
TBR=mmenke@chromium.org
Review URL: http://codereview.chromium.org/8822002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113100 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/host_resolver_impl.h | 1 | ||||
| -rw-r--r-- | net/net.gyp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h index 87704f5..da69451 100644 --- a/net/base/host_resolver_impl.h +++ b/net/base/host_resolver_impl.h @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" +#include "net/base/capturing_net_log.h" #include "net/base/host_cache.h" #include "net/base/host_resolver.h" #include "net/base/host_resolver_proc.h" diff --git a/net/net.gyp b/net/net.gyp index 1e66758..777f0f6 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -56,6 +56,8 @@ 'base/bandwidth_metrics.cc', 'base/bandwidth_metrics.h', 'base/cache_type.h', + 'base/capturing_net_log.cc', + 'base/capturing_net_log.h', 'base/cert_database.cc', 'base/cert_database.h', 'base/cert_database_mac.cc', @@ -1365,8 +1367,6 @@ '../testing/gtest.gyp:gtest', ], 'sources': [ - 'base/capturing_net_log.cc', - 'base/capturing_net_log.h', 'base/cert_test_util.cc', 'base/cert_test_util.h', 'base/cookie_monster_store_test.cc', |