summaryrefslogtreecommitdiffstats
path: root/net/base/net_log.cc
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 19:16:08 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 19:16:08 +0000
commitbd67a8f858b00b005e3d6dbf9a852e233d8d1919 (patch)
tree1fd3d30f116ea00bafcbf042176da52e3a24cd8d /net/base/net_log.cc
parent950c80cfd744841f16f36a7c9a44750b41dbaf42 (diff)
downloadchromium_src-bd67a8f858b00b005e3d6dbf9a852e233d8d1919.zip
chromium_src-bd67a8f858b00b005e3d6dbf9a852e233d8d1919.tar.gz
chromium_src-bd67a8f858b00b005e3d6dbf9a852e233d8d1919.tar.bz2
A pair of changes to make it easier to use NetLogs in
unit tests. Add NetLog support to TestRequestContexts. Move value of kInvalidId into cc file, as it was causing linker errors when used in test files, otherwise. Review URL: https://chromiumcodereview.appspot.com/11280302 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_log.cc')
-rw-r--r--net/base/net_log.cc14
1 files changed, 13 insertions, 1 deletions
diff --git a/net/base/net_log.cc b/net/base/net_log.cc
index 372930d..b811db4 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -32,7 +32,7 @@ Value* BytesTransferredCallback(int byte_count,
Value* SourceEventParametersCallback(const NetLog::Source source,
NetLog::LogLevel /* log_level */) {
- if (!source.is_valid())
+ if (!source.IsValid())
return NULL;
DictionaryValue* event_params = new DictionaryValue();
source.AddToEventParameters(event_params);
@@ -73,6 +73,18 @@ Value* NetLogString16Callback(const char* name,
} // namespace
+const uint32 NetLog::Source::kInvalidId = 0;
+
+NetLog::Source::Source() : type(SOURCE_NONE), id(kInvalidId) {
+}
+
+NetLog::Source::Source(SourceType type, uint32 id) : type(type), id(id) {
+}
+
+bool NetLog::Source::IsValid() const {
+ return id != kInvalidId;
+}
+
void NetLog::Source::AddToEventParameters(DictionaryValue* event_params) const {
DictionaryValue* dict = new DictionaryValue();
dict->SetInteger("type", static_cast<int>(type));