Page load metrics observers cleanup

chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_DATA_REDUCTION_PROXY_METRICS_OBSERVER_H_
 #define CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_DATA_REDUCTION_PROXY_METRICS_OBSERVER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 26 matching lines @@
 extern const char kHistogramFirstContentfulPaintSuffix[];
 extern const char kHistogramFirstMeaningfulPaintSuffix[];
 extern const char kHistogramFirstImagePaintSuffix[];
 extern const char kHistogramFirstPaintSuffix[];
 extern const char kHistogramFirstTextPaintSuffix[];
 extern const char kHistogramParseStartSuffix[];
 extern const char kHistogramParseBlockedOnScriptLoadSuffix[];
 extern const char kHistogramParseDurationSuffix[];
 
 // Byte and request specific histogram suffixes.
-extern const char kRequestsPercentProxied[];
+extern const char kResourcesPercentProxied[];
 extern const char kBytesPercentProxied[];
 extern const char kBytesCompressionRatio[];
 extern const char kBytesInflationPercent[];
-extern const char kNetworkRequests[];
-extern const char kRequestsProxied[];
-extern const char kRequestsNotProxied[];
+extern const char kNetworkResources[];
+extern const char kResourcesProxied[];
+extern const char kResourcesNotProxied[];
 extern const char kNetworkBytes[];
 extern const char kBytesProxied[];
 extern const char kBytesNotProxied[];
 extern const char kBytesOriginal[];
 extern const char kBytesSavings[];
 extern const char kBytesInflation[];
 
 }  // namespace internal
 
 // Observer responsible for recording core page load metrics releveant to
 // DataReductionProxy.
 class DataReductionProxyMetricsObserver
     : public page_load_metrics::PageLoadMetricsObserver {
  public:
   DataReductionProxyMetricsObserver();
   ~DataReductionProxyMetricsObserver() override;
 
   // page_load_metrics::PageLoadMetricsObserver:
   ObservePolicy OnStart(content::NavigationHandle* navigation_handle,
                         const GURL& currently_committed_url,
                         bool started_in_foreground) override;
   ObservePolicy OnCommit(content::NavigationHandle* navigation_handle) override;
-  ObservePolicy OnHidden(
-      const page_load_metrics::PageLoadTiming& timing,
-      const page_load_metrics::PageLoadExtraInfo& info) override;
   ObservePolicy FlushMetricsOnAppEnterBackground(
       const page_load_metrics::PageLoadTiming& timing,
       const page_load_metrics::PageLoadExtraInfo& info) override;
   void OnComplete(const page_load_metrics::PageLoadTiming& timing,
                   const page_load_metrics::PageLoadExtraInfo& info) override;
   void OnDomContentLoadedEventStart(
       const page_load_metrics::PageLoadTiming& timing,
       const page_load_metrics::PageLoadExtraInfo& info) override;
   void OnLoadEventStart(
       const page_load_metrics::PageLoadTiming& timing,
@@ skipping 31 matching lines @@
 
   // Gets the default DataReductionProxyPingbackClient. Overridden in testing.
   virtual DataReductionProxyPingbackClient* GetPingbackClient() const;
 
   // Data related to this navigation.
   std::unique_ptr<DataReductionProxyData> data_;
 
   // The browser context this navigation is operating in.
   content::BrowserContext* browser_context_;
 
-  // The number of requests that used data reduction proxy.
-  int num_data_reduction_proxy_requests_;
+  // The number of resources that used data reduction proxy.
+  int num_data_reduction_proxy_resources_;
 
-  // The number of request that did not come from cache.
-  int num_network_requests_;
+  // The number of resources that did not come from cache.
+  int num_network_resources_;
 
   // The total content network bytes that the user would have downloaded if they
   // were not using data reduction proxy.
   int64_t original_network_bytes_;
 
   // The total network bytes loaded through data reduction proxy.
   int64_t network_bytes_proxied_;
 
   // The total network bytes used.
   int64_t network_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyMetricsObserver);
 };
 
 }  // namespace data_reduction_proxy
 
 #endif  // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_DATA_REDUCTION_PROXY_METRICS_OBSERVER_H_