Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: net/base/net_log.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/net_log.cc
diff --git a/net/base/net_log.cc b/net/base/net_log.cc
index 6016d0de026d44d2b92a1c8654f45ef02420a1ba..edada92d35e241be8bf4dffe4766a78399327b19 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -105,8 +105,7 @@ bool NetLog::Source::FromEventParameters(base::Value* event_params,
base::DictionaryValue* source_dict;
int source_id;
int source_type;
- if (!event_params ||
- !event_params->GetAsDictionary(&dict) ||
+ if (!event_params || !event_params->GetAsDictionary(&dict) ||
!dict->GetDictionary("source_dependency", &source_dict) ||
!source_dict->GetInteger("id", &source_id) ||
!source_dict->GetInteger("type", &source_type)) {
@@ -151,12 +150,11 @@ base::Value* NetLog::Entry::ParametersToValue() const {
return NULL;
}
-NetLog::EntryData::EntryData(
- EventType type,
- Source source,
- EventPhase phase,
- base::TimeTicks time,
- const ParametersCallback* parameters_callback)
+NetLog::EntryData::EntryData(EventType type,
+ Source source,
+ EventPhase phase,
+ base::TimeTicks time,
+ const ParametersCallback* parameters_callback)
: type(type),
source(source),
phase(phase),
@@ -174,8 +172,8 @@ NetLog::Entry::Entry(const EntryData* data, LogLevel log_level)
NetLog::Entry::~Entry() {
}
-NetLog::ThreadSafeObserver::ThreadSafeObserver() : log_level_(LOG_NONE),
- net_log_(NULL) {
+NetLog::ThreadSafeObserver::ThreadSafeObserver()
+ : log_level_(LOG_NONE), net_log_(NULL) {
}
NetLog::ThreadSafeObserver::~ThreadSafeObserver() {
@@ -199,9 +197,7 @@ void NetLog::ThreadSafeObserver::OnAddEntryData(const EntryData& entry_data) {
}
NetLog::NetLog()
- : last_id_(0),
- base_log_level_(LOG_NONE),
- effective_log_level_(LOG_NONE) {
+ : last_id_(0), base_log_level_(LOG_NONE), effective_log_level_(LOG_NONE) {
}
NetLog::~NetLog() {
@@ -240,9 +236,8 @@ NetLog::LogLevel NetLog::GetLogLevel() const {
return static_cast<net::NetLog::LogLevel>(log_level);
}
-void NetLog::AddThreadSafeObserver(
- net::NetLog::ThreadSafeObserver* observer,
- LogLevel log_level) {
+void NetLog::AddThreadSafeObserver(net::NetLog::ThreadSafeObserver* observer,
+ LogLevel log_level) {
DCHECK_NE(LOG_NONE, log_level);
base::AutoLock lock(lock_);
@@ -254,9 +249,8 @@ void NetLog::AddThreadSafeObserver(
UpdateLogLevel();
}
-void NetLog::SetObserverLogLevel(
- net::NetLog::ThreadSafeObserver* observer,
- LogLevel log_level) {
+void NetLog::SetObserverLogLevel(net::NetLog::ThreadSafeObserver* observer,
+ LogLevel log_level) {
DCHECK_NE(LOG_NONE, log_level);
base::AutoLock lock(lock_);
@@ -292,8 +286,7 @@ void NetLog::UpdateLogLevel() {
new_effective_log_level =
std::min(new_effective_log_level, observer->log_level());
}
- base::subtle::NoBarrier_Store(&effective_log_level_,
- new_effective_log_level);
+ base::subtle::NoBarrier_Store(&effective_log_level_, new_effective_log_level);
}
// static
@@ -305,7 +298,9 @@ std::string NetLog::TickCountToString(const base::TimeTicks& time) {
// static
const char* NetLog::EventTypeToString(EventType event) {
switch (event) {
-#define EVENT_TYPE(label) case TYPE_ ## label: return #label;
+#define EVENT_TYPE(label) \
+ case TYPE_##label: \
+ return #label;
#include "net/base/net_log_event_type_list.h"
#undef EVENT_TYPE
default:
@@ -326,7 +321,9 @@ base::Value* NetLog::GetEventTypesAsValue() {
// static
const char* NetLog::SourceTypeToString(SourceType source) {
switch (source) {
-#define SOURCE_TYPE(label) case SOURCE_ ## label: return #label;
+#define SOURCE_TYPE(label) \
+ case SOURCE_##label: \
+ return #label;
#include "net/base/net_log_source_type_list.h"
#undef SOURCE_TYPE
default:
@@ -400,8 +397,8 @@ void NetLog::AddEntry(EventType type,
const NetLog::ParametersCallback* parameters_callback) {
if (GetLogLevel() == LOG_NONE)
return;
- EntryData entry_data(type, source, phase, base::TimeTicks::Now(),
- parameters_callback);
+ EntryData entry_data(
+ type, source, phase, base::TimeTicks::Now(), parameters_callback);
// Notify all of the log observers.
base::AutoLock lock(lock_);
@@ -495,8 +492,7 @@ bool BoundNetLog::IsLogging() const {
}
// static
-BoundNetLog BoundNetLog::Make(NetLog* net_log,
- NetLog::SourceType source_type) {
+BoundNetLog BoundNetLog::Make(NetLog* net_log, NetLog::SourceType source_type) {
if (!net_log)
return BoundNetLog();

Powered by Google App Engine
This is Rietveld 408576698