| Index: net/base/net_log_logger.cc
|
| diff --git a/net/base/net_log_logger.cc b/net/base/net_log_logger.cc
|
| index 9653e5988557540e55d20f0d6ddb4a36c87ce67f..105a46df1c1792ec2e92e07abfdddcbda205dcc8 100644
|
| --- a/net/base/net_log_logger.cc
|
| +++ b/net/base/net_log_logger.cc
|
| @@ -60,9 +60,7 @@ void NetLogLogger::OnAddEntry(const net::NetLog::Entry& entry) {
|
| scoped_ptr<base::Value> value(entry.ToValue());
|
| std::string json;
|
| base::JSONWriter::Write(value.get(), &json);
|
| - fprintf(file_.get(), "%s%s",
|
| - (added_events_ ? ",\n" : ""),
|
| - json.c_str());
|
| + fprintf(file_.get(), "%s%s", (added_events_ ? ",\n" : ""), json.c_str());
|
| added_events_ = true;
|
| }
|
|
|
| @@ -82,7 +80,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
|
|
| #define LOAD_FLAG(label, value) \
|
| - dict->SetInteger(# label, static_cast<int>(value));
|
| + dict->SetInteger(#label, static_cast<int>(value));
|
| #include "net/base/load_flags_list.h"
|
| #undef LOAD_FLAG
|
|
|
| @@ -94,8 +92,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
|
| {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
|
|
| -#define LOAD_STATE(label) \
|
| - dict->SetInteger(# label, net::LOAD_STATE_ ## label);
|
| +#define LOAD_STATE(label) dict->SetInteger(#label, net::LOAD_STATE_##label);
|
| #include "net/base/load_states_list.h"
|
| #undef LOAD_STATE
|
|
|
| @@ -108,7 +105,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
|
|
| #define NET_ERROR(label, value) \
|
| - dict->SetInteger(# label, static_cast<int>(value));
|
| + dict->SetInteger(#label, static_cast<int>(value));
|
| #include "net/base/net_error_list.h"
|
| #undef NET_ERROR
|
|
|
| @@ -181,10 +178,8 @@ base::DictionaryValue* NetLogLogger::GetConstants() {
|
|
|
| dict->SetInteger("ADDRESS_FAMILY_UNSPECIFIED",
|
| net::ADDRESS_FAMILY_UNSPECIFIED);
|
| - dict->SetInteger("ADDRESS_FAMILY_IPV4",
|
| - net::ADDRESS_FAMILY_IPV4);
|
| - dict->SetInteger("ADDRESS_FAMILY_IPV6",
|
| - net::ADDRESS_FAMILY_IPV6);
|
| + dict->SetInteger("ADDRESS_FAMILY_IPV4", net::ADDRESS_FAMILY_IPV4);
|
| + dict->SetInteger("ADDRESS_FAMILY_IPV6", net::ADDRESS_FAMILY_IPV6);
|
|
|
| constants_dict->Set("addressFamily", dict);
|
| }
|
|
|