Commit 34e375de authored by mmenke@chromium.org's avatar mmenke@chromium.org

Move CapturingNetLog over to net_test_support from net.

R=eroman@chromium.org
BUG=none

Review URL: https://chromiumcodereview.appspot.com/10532067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141265 0039d316-1c4b-4281-b951-d872f2087c98
parent 41d9f90d
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "base/time.h" #include "base/time.h"
#include "net/base/net_export.h"
#include "net/base/net_log.h" #include "net/base/net_log.h"
namespace base { namespace base {
...@@ -26,13 +25,11 @@ class DictionaryValue; ...@@ -26,13 +25,11 @@ class DictionaryValue;
namespace net { namespace net {
// CapturingNetLog is an implementation of NetLog that saves messages to a // CapturingNetLog is an implementation of NetLog that saves messages to a
// bounded buffer. CapturingNetLogs should only be used in unit tests, never // bounded buffer. It is intended for testing only, and is part of the
// in production code. // net_test_support project.
// TODO(mmenke): Move CapturingNetLog to net_unittests project, once the CL class CapturingNetLog : public NetLog {
// to remove the use of it in the Jingle unit tests has landed.
class NET_EXPORT CapturingNetLog : public NetLog {
public: public:
struct NET_EXPORT_PRIVATE CapturedEntry { struct CapturedEntry {
CapturedEntry(EventType type, CapturedEntry(EventType type,
const base::TimeTicks& time, const base::TimeTicks& time,
Source source, Source source,
...@@ -116,7 +113,7 @@ class NET_EXPORT CapturingNetLog : public NetLog { ...@@ -116,7 +113,7 @@ class NET_EXPORT CapturingNetLog : public NetLog {
// //
// CapturingBoundNetLog can easily be converted to a BoundNetLog using the // CapturingBoundNetLog can easily be converted to a BoundNetLog using the
// bound() method. // bound() method.
class NET_EXPORT_PRIVATE CapturingBoundNetLog { class CapturingBoundNetLog {
public: public:
explicit CapturingBoundNetLog(size_t max_num_entries); explicit CapturingBoundNetLog(size_t max_num_entries);
......
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
'base/big_endian.cc', 'base/big_endian.cc',
'base/big_endian.h', 'base/big_endian.h',
'base/cache_type.h', 'base/cache_type.h',
'base/capturing_net_log.cc',
'base/capturing_net_log.h',
'base/cert_database.cc', 'base/cert_database.cc',
'base/cert_database.h', 'base/cert_database.h',
'base/cert_database_mac.cc', 'base/cert_database_mac.cc',
...@@ -1503,6 +1501,8 @@ ...@@ -1503,6 +1501,8 @@
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
], ],
'sources': [ 'sources': [
'base/capturing_net_log.cc',
'base/capturing_net_log.h',
'base/cert_test_util.cc', 'base/cert_test_util.cc',
'base/cert_test_util.h', 'base/cert_test_util.h',
'base/mock_cert_verifier.cc', 'base/mock_cert_verifier.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment