| Index: components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc
|
| diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc
|
| index ef12af580499f609c40cbd56c2166ead83d5aec3..3966b70dfdb8ccf9dc1bb46de092b5b1cbab50aa 100644
|
| --- a/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc
|
| +++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc
|
| @@ -43,7 +43,8 @@ scoped_ptr<base::Value> BuildDataReductionProxyEvent(
|
| base::TimeTicks ticks_now = base::TimeTicks::Now();
|
| net::NetLog::EntryData entry_data(
|
| type, source, phase, ticks_now, ¶meters_callback);
|
| - net::NetLog::Entry entry(&entry_data, net::NetLog::LOG_ALL);
|
| + net::NetLog::Entry entry(&entry_data,
|
| + net::NetLogCaptureMode::IncludeSocketBytes());
|
| scoped_ptr<base::Value> entry_value(entry.ToValue());
|
|
|
| return entry_value;
|
| @@ -76,7 +77,7 @@ base::Value* EnableDataReductionProxyCallback(
|
| const std::string& primary_origin,
|
| const std::string& fallback_origin,
|
| const std::string& ssl_origin,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| + net::NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetBoolean("enabled", true);
|
| dict->SetBoolean("primary_restricted", primary_restricted);
|
| @@ -88,17 +89,18 @@ base::Value* EnableDataReductionProxyCallback(
|
| }
|
|
|
| base::Value* DisableDataReductionProxyCallback(
|
| - net::NetLog::LogLevel /* log_level */) {
|
| + net::NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetBoolean("enabled", false);
|
| return dict;
|
| }
|
|
|
| -base::Value* UrlBypassActionCallback(const std::string& action,
|
| - const GURL& url,
|
| - int bypass_seconds,
|
| - int64 expiration_ticks,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| +base::Value* UrlBypassActionCallback(
|
| + const std::string& action,
|
| + const GURL& url,
|
| + int bypass_seconds,
|
| + int64 expiration_ticks,
|
| + net::NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("action", action);
|
| dict->SetString("url", url.spec());
|
| @@ -113,7 +115,7 @@ base::Value* UrlBypassTypeCallback(
|
| const GURL& url,
|
| int bypass_seconds,
|
| int64 expiration_ticks,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| + net::NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("bypass_type", bypass_type);
|
| dict->SetString("url", url.spec());
|
|
|