Add 'Other' category on the Data Saver site-breakdown page

components/data_reduction_proxy/core/browser/data_reduction_proxy_data_use_observer.cc

 // Copyright 2017 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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_data_use_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
@@ skipping 22 matching lines @@
   void IncrementBytes(int64_t network_bytes, int64_t original_bytes) {
     network_bytes_ += network_bytes;
     original_bytes_ += original_bytes;
   }
 
  private:
   int64_t network_bytes_;
   int64_t original_bytes_;
 };
 
+// Hostname used for the other bucket which consists of chrome-services traffic.
+// This should be in sync with the same in DataReductionSiteBreakdownView.java
+const char kOtherHostName[] = "Other";
+
 // static
 const void* DataUseUserDataBytes::kUserDataKey =
     &DataUseUserDataBytes::kUserDataKey;
 
 }  // namespace
 
 namespace data_reduction_proxy {
 
 DataReductionProxyDataUseObserver::DataReductionProxyDataUseObserver(
     DataReductionProxyIOData* data_reduction_proxy_io_data,
@@ skipping 24 matching lines @@
         data_use->url().HostNoBrackets());
     data_use->RemoveUserData(DataUseUserDataBytes::kUserDataKey);
   }
 }
 
 void DataReductionProxyDataUseObserver::OnPageResourceLoad(
     const net::URLRequest& request,
     data_use_measurement::DataUse* data_use) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
-  if (data_use->traffic_type() !=
-      data_use_measurement::DataUse::TrafficType::USER_TRAFFIC) {
-    return;
-  }
-
   if (!request.url().SchemeIs(url::kHttpsScheme) &&
       !request.url().SchemeIs(url::kHttpScheme)) {
     return;
   }
 
+  if (request.GetTotalReceivedBytes() <= 0)
+    return;
+
   int64_t network_bytes = request.GetTotalReceivedBytes();
   DataReductionProxyRequestType request_type = GetDataReductionProxyRequestType(
       request, data_reduction_proxy_io_data_->configurator()->GetProxyConfig(),
       *data_reduction_proxy_io_data_->config());
 
   // Estimate how many bytes would have been used if the DataReductionProxy was
   // not used, and record the data usage.
   int64_t original_bytes = util::EstimateOriginalReceivedBytes(
       request, request_type == VIA_DATA_REDUCTION_PROXY,
       data_reduction_proxy_io_data_->lofi_decider());
 
-  if (!data_use->url().is_valid()) {
+  if (data_use->traffic_type() ==
+          data_use_measurement::DataUse::TrafficType::USER_TRAFFIC &&
+      !data_use->url().is_valid()) {
     // URL will be empty until pageload navigation commits. Save the data use of
     // these mainframe, subresource, redirected requests in user data until
     // then.
     DataUseUserDataBytes* bytes = reinterpret_cast<DataUseUserDataBytes*>(
         data_use->GetUserData(DataUseUserDataBytes::kUserDataKey));
     if (bytes) {
       bytes->IncrementBytes(network_bytes, original_bytes);
     } else {
       data_use->SetUserData(DataUseUserDataBytes::kUserDataKey,
                             base::MakeUnique<DataUseUserDataBytes>(
                                 network_bytes, original_bytes));
     }
   } else {
     data_reduction_proxy_io_data_->UpdateDataUseForHost(
-        network_bytes, original_bytes, data_use->url().HostNoBrackets());
+        network_bytes, original_bytes,
+        data_use->traffic_type() ==
+                data_use_measurement::DataUse::TrafficType::USER_TRAFFIC
+            ? data_use->url().HostNoBrackets()
+            : kOtherHostName);
   }
 }
 
 }  // namespace data_reduction_proxy