| Index: chrome/browser/page_load_metrics/metrics_web_contents_observer.h
|
| diff --git a/chrome/browser/page_load_metrics/metrics_web_contents_observer.h b/chrome/browser/page_load_metrics/metrics_web_contents_observer.h
|
| index 30725afec8da21619934e4b486f009e6f46aea3f..84c937c98687dc17b96d8abeab1df5df560bfe49 100644
|
| --- a/chrome/browser/page_load_metrics/metrics_web_contents_observer.h
|
| +++ b/chrome/browser/page_load_metrics/metrics_web_contents_observer.h
|
| @@ -13,13 +13,16 @@
|
| #include "base/observer_list.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/page_load_metrics/page_load_metrics_observer.h"
|
| +#include "chrome/common/page_load_metrics/page_load_metrics.mojom.h"
|
| #include "chrome/common/page_load_metrics/page_load_timing.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_data.h"
|
| #include "content/public/browser/render_widget_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "content/public/browser/web_contents_binding_set.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_contents_user_data.h"
|
| #include "content/public/common/resource_type.h"
|
| +#include "mojo/public/cpp/bindings/binding_set.h"
|
| #include "third_party/WebKit/public/platform/WebInputEvent.h"
|
|
|
| namespace content {
|
| @@ -42,7 +45,8 @@ class PageLoadTracker;
|
| class MetricsWebContentsObserver
|
| : public content::WebContentsObserver,
|
| public content::WebContentsUserData<MetricsWebContentsObserver>,
|
| - public content::RenderWidgetHost::InputEventObserver {
|
| + public content::RenderWidgetHost::InputEventObserver,
|
| + public mojom::PageLoadMetrics {
|
| public:
|
| // TestingObserver allows tests to observe MetricsWebContentsObserver state
|
| // changes. Tests may use TestingObserver to wait until certain state changes,
|
| @@ -140,8 +144,20 @@ class MetricsWebContentsObserver
|
| const PageLoadTiming& timing,
|
| const PageLoadMetadata& metadata);
|
|
|
| + content::WebContentsFrameBindingSet<mojom::PageLoadMetrics>&
|
| + page_load_metrics_binding_for_testing() {
|
| + return page_load_metrics_binding_;
|
| + }
|
| +
|
| private:
|
| friend class content::WebContentsUserData<MetricsWebContentsObserver>;
|
| + friend class FakePageLoadMetrics;
|
| + friend class MetricsWebContentsObserverTest;
|
| + friend class PageLoadMetricsObserverTestHarness;
|
| +
|
| + // page_load_metrics::mojom::PageLoadMetrics implementation.
|
| + void UpdateTiming(const PageLoadTiming& timing,
|
| + const PageLoadMetadata& metadata) override;
|
|
|
| void HandleFailedNavigationForTrackedLoad(
|
| content::NavigationHandle* navigation_handle,
|
| @@ -210,6 +226,8 @@ class MetricsWebContentsObserver
|
| bool has_navigated_;
|
|
|
| base::ObserverList<TestingObserver> testing_observers_;
|
| + content::WebContentsFrameBindingSet<mojom::PageLoadMetrics>
|
| + page_load_metrics_binding_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MetricsWebContentsObserver);
|
| };
|
|
|