Add data reduction proxy debug info to net-internals#bandwidth

chrome/browser/net/chrome_network_delegate.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/net/chrome_network_delegate.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 248 matching lines @@
       url_blacklist_manager_(NULL),
 #endif
       domain_reliability_monitor_(NULL),
       received_content_length_(0),
       original_content_length_(0),
       first_request_(true),
       prerender_tracker_(NULL),
       data_reduction_proxy_params_(NULL),
       data_reduction_proxy_usage_stats_(NULL),
       data_reduction_proxy_auth_request_handler_(NULL),
-      data_reduction_proxy_statistics_prefs_(NULL) {
+      data_reduction_proxy_statistics_prefs_(NULL),
+      data_reduction_proxy_event_store_(NULL) {
   DCHECK(enable_referrers);
   extensions_delegate_.reset(
       ChromeExtensionsNetworkDelegate::Create(event_router));
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
 void ChromeNetworkDelegate::set_extension_info_map(
     extensions::InfoMap* extension_info_map) {
   extensions_delegate_->set_extension_info_map(extension_info_map);
@@ skipping 90 matching lines @@
 base::Value* ChromeNetworkDelegate::SessionNetworkStatsInfoToValue() const {
   base::DictionaryValue* dict = new base::DictionaryValue();
   // Use strings to avoid overflow.  base::Value only supports 32-bit integers.
   dict->SetString("session_received_content_length",
                   base::Int64ToString(received_content_length_));
   dict->SetString("session_original_content_length",
                   base::Int64ToString(original_content_length_));
   return dict;
 }
 
+base::Value* ChromeNetworkDelegate::DataReductionProxyInfoToValue() const {
+  base::DictionaryValue* proxy_info_dict = new base::DictionaryValue();

[bengr, 2014/12/02 23:55:32]

proxy_info_dict -> data_reduction_proxy_info

[jeremyim, 2014/12/03 08:10:36]

Done.

+
+  if (data_reduction_proxy_enabled_) {
+    proxy_info_dict->SetString("enabled",

[bengr, 2014/12/02 23:55:32]

I prefer this slightly:

proxy_info_dict->SetString(
    "enabled",
    data_reduction_proxy_enabled_->GetValue() ? "true" : "false");

You could also do:

if (!data_reduction_proxy_enabled_)
  data_reduction_proxy_info->SetString("enabled", "unknown");
else if (data_reduction_proxy_enabled_->GetValue())
  data_reduction_proxy_info->SetString("enabled", "true");
else
  data_reduction_proxy_info->SetString("enabled", "false");

Or, if you want to be fancy (I don't like this as much):

data_reduction_proxy_info->SetString(
    "enabled",
    (data_reduction_proxy_enabled_ ?
        (data_reduction_proxy_enabled_->GetValue() ? "true" : "false") :
        "unknown");

[jeremyim, 2014/12/03 08:10:36]

Done.

+                                data_reduction_proxy_enabled_->GetValue() ?
+                                    "true" : "false");
+  } else {
+    proxy_info_dict->SetString("enabled", "unknown");
+  }
+
+  if (data_reduction_proxy_event_store_) {
+    data_reduction_proxy_event_store_->AddStoredEvents(proxy_info_dict);
+  }
+
+  return proxy_info_dict;
+}
+
 int ChromeNetworkDelegate::OnBeforeURLRequest(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     GURL* new_url) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // TODO(joaodasilva): This prevents extensions from seeing URLs that are
   // blocked. However, an extension might redirect the request to another URL,
   // which is not blocked.
   int error = net::ERR_BLOCKED_BY_ADMINISTRATOR;
   if (url_blacklist_manager_ &&
@@ skipping 442 matching lines @@
   if (data_reduction_proxy_statistics_prefs_) {
     StoreAccumulatedContentLength(received_content_length,
                                   original_content_length,
                                   request_type,
                                   reinterpret_cast<Profile*>(profile_),
                                   data_reduction_proxy_statistics_prefs_);
   }
   received_content_length_ += received_content_length;
   original_content_length_ += original_content_length;
 }