summaryrefslogtreecommitdiffstats
path: root/net/base/net_log.cc
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 16:29:07 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 16:29:07 +0000
commit8effd3f691277e168a10890127085a3bc999810f (patch)
treef249b4aa38200eeba84d5324debf1776f80253b5 /net/base/net_log.cc
parent9c7ec6dd24d8774cc88232354cd15f31ed28d61d (diff)
downloadchromium_src-8effd3f691277e168a10890127085a3bc999810f.zip
chromium_src-8effd3f691277e168a10890127085a3bc999810f.tar.gz
chromium_src-8effd3f691277e168a10890127085a3bc999810f.tar.bz2
Remove most unnecessary uses of "net::" in net/base/.
Also removes several empty and unused gtest test fixtures. R=willchan@chromium.org Review URL: http://codereview.chromium.org/6676134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_log.cc')
-rw-r--r--net/base/net_log.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/base/net_log.cc b/net/base/net_log.cc
index 4484a8a0..0449634 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -71,11 +71,11 @@ const char* NetLog::EventPhaseToString(EventPhase phase) {
}
// static
-Value* NetLog::EntryToDictionaryValue(net::NetLog::EventType type,
+Value* NetLog::EntryToDictionaryValue(NetLog::EventType type,
const base::TimeTicks& time,
- const net::NetLog::Source& source,
- net::NetLog::EventPhase phase,
- net::NetLog::EventParameters* params,
+ const NetLog::Source& source,
+ NetLog::EventPhase phase,
+ NetLog::EventParameters* params,
bool use_strings) {
DictionaryValue* entry_dict = new DictionaryValue();
@@ -88,7 +88,7 @@ Value* NetLog::EntryToDictionaryValue(net::NetLog::EventType type,
source_dict->SetInteger("type", static_cast<int>(source.type));
} else {
source_dict->SetString("type",
- net::NetLog::SourceTypeToString(source.type));
+ NetLog::SourceTypeToString(source.type));
}
entry_dict->Set("source", source_dict);
@@ -97,8 +97,8 @@ Value* NetLog::EntryToDictionaryValue(net::NetLog::EventType type,
entry_dict->SetInteger("type", static_cast<int>(type));
entry_dict->SetInteger("phase", static_cast<int>(phase));
} else {
- entry_dict->SetString("type", net::NetLog::EventTypeToString(type));
- entry_dict->SetString("phase", net::NetLog::EventPhaseToString(phase));
+ entry_dict->SetString("type", NetLog::EventTypeToString(type));
+ entry_dict->SetString("phase", NetLog::EventPhaseToString(phase));
}
// Set the event-specific parameters.
@@ -147,7 +147,7 @@ void BoundNetLog::EndEvent(
void BoundNetLog::EndEventWithNetErrorCode(NetLog::EventType event_type,
int net_error) const {
- DCHECK_NE(net_error, net::ERR_IO_PENDING);
+ DCHECK_NE(net_error, ERR_IO_PENDING);
if (net_error >= 0) {
EndEvent(event_type, NULL);
} else {