| Index: net/base/net_log_logger.cc
|
| diff --git a/net/base/net_log_logger.cc b/net/base/net_log_logger.cc
|
| index 0c0f1c925b64f5e194cdf6e5167402808e48c534..3934e53d71e98bd908af3ed23e4435c3c668bd50 100644
|
| --- a/net/base/net_log_logger.cc
|
| +++ b/net/base/net_log_logger.cc
|
| @@ -25,19 +25,25 @@ struct StringToConstant {
|
| };
|
|
|
| const StringToConstant kCertStatusFlags[] = {
|
| -#define CERT_STATUS_FLAG(label, value) { #label, value },
|
| +#define CERT_STATUS_FLAG(label, value) \
|
| + { #label, value } \
|
| + ,
|
| #include "net/cert/cert_status_flags_list.h"
|
| #undef CERT_STATUS_FLAG
|
| };
|
|
|
| const StringToConstant kLoadFlags[] = {
|
| -#define LOAD_FLAG(label, value) { #label, value },
|
| +#define LOAD_FLAG(label, value) \
|
| + { #label, value } \
|
| + ,
|
| #include "net/base/load_flags_list.h"
|
| #undef LOAD_FLAG
|
| };
|
|
|
| const StringToConstant kLoadStateTable[] = {
|
| -#define LOAD_STATE(label) { # label, net::LOAD_STATE_ ## label },
|
| +#define LOAD_STATE(label) \
|
| + { #label, net::LOAD_STATE_##label } \
|
| + ,
|
| #include "net/base/load_states_list.h"
|
| #undef LOAD_STATE
|
| };
|
| @@ -96,9 +102,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;
|
| }
|
|
|
| @@ -222,10 +226,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);
|
| }
|
|
|