Revert of [Page Load Metrics] PageLoadMetrics Mojofication.

chrome/renderer/page_load_metrics/metrics_render_frame_observer.cc

Index: chrome/renderer/page_load_metrics/metrics_render_frame_observer.cc
diff --git a/chrome/renderer/page_load_metrics/metrics_render_frame_observer.cc b/chrome/renderer/page_load_metrics/metrics_render_frame_observer.cc
index 9996789b18d90ae56532d9efe4f100b0b9e16bd4..95ae2c28a875e85f8e3077b1645cabfc30997602 100644
--- a/chrome/renderer/page_load_metrics/metrics_render_frame_observer.cc
+++ b/chrome/renderer/page_load_metrics/metrics_render_frame_observer.cc
@@ -6,17 +6,12 @@
 
 #include <string>
 
-#include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/common/chrome_features.h"
-#include "chrome/common/page_load_metrics/page_load_metrics_messages.h"
 #include "chrome/renderer/page_load_metrics/page_timing_metrics_sender.h"
-#include "chrome/renderer/page_load_metrics/page_timing_sender.h"
 #include "chrome/renderer/page_load_metrics/renderer_page_track_decider.h"
 #include "chrome/renderer/searchbox/search_bouncer.h"
-#include "content/public/common/associated_interface_provider.h"
 #include "content/public/renderer/render_frame.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -33,45 +28,6 @@
     event = start;
   return base::Time::FromDoubleT(event) - base::Time::FromDoubleT(start);
 }
-
-class LegacyIPCPageTimingSender : public PageTimingSender {
- public:
-  LegacyIPCPageTimingSender(content::RenderFrame* render_frame,
-                            const int routing_id)
-      : render_frame_(render_frame), routing_id_(routing_id) {}
-  ~LegacyIPCPageTimingSender() override {}
-
-  void SendTiming(const mojom::PageLoadTimingPtr& timing,
-                  const mojom::PageLoadMetadataPtr& metadata) override {
-    DCHECK(render_frame_);
-    render_frame_->Send(
-        new PageLoadMetricsMsg_TimingUpdated(routing_id_, *timing, *metadata));
-  }
-
- private:
-  content::RenderFrame* const render_frame_;
-  const int routing_id_;
-};
-
-class MojoIPCPageTimingSender : public PageTimingSender {
- public:
-  explicit MojoIPCPageTimingSender(content::RenderFrame* render_frame) {
-    DCHECK(render_frame);
-    render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
-        &page_load_metrics_);
-  }
-  ~MojoIPCPageTimingSender() override {}
-  void SendTiming(const mojom::PageLoadTimingPtr& timing,
-                  const mojom::PageLoadMetadataPtr& metadata) override {
-    DCHECK(page_load_metrics_);
-    page_load_metrics_->UpdateTiming(timing->Clone(), metadata->Clone());
-  }
-
- private:
-  // Use associated interface to make sure mojo messages are ordered with regard
-  // to legacy IPC messages.
-  mojom::PageLoadMetricsAssociatedPtr page_load_metrics_;
-};
 
 }  //  namespace
 
@@ -115,7 +71,7 @@
   // those metrics become available.
   if (ShouldSendMetrics()) {
     page_timing_metrics_sender_ = base::MakeUnique<PageTimingMetricsSender>(
-        CreatePageTimingSender(), CreateTimer(), GetTiming());
+        this, routing_id(), CreateTimer(), GetTiming());
   }
 }
 
@@ -211,16 +167,6 @@
   return base::WrapUnique(new base::OneShotTimer);
 }
 
-std::unique_ptr<PageTimingSender>
-MetricsRenderFrameObserver::CreatePageTimingSender() {
-  if (base::FeatureList::IsEnabled(features::kPageLoadMetricsMojofication)) {
-    return base::WrapUnique<PageTimingSender>(
-        new MojoIPCPageTimingSender(render_frame()));
-  }
-  return base::WrapUnique<PageTimingSender>(
-      new LegacyIPCPageTimingSender(render_frame(), routing_id()));
-}
-
 bool MetricsRenderFrameObserver::HasNoRenderFrame() const {
   bool no_frame = !render_frame() || !render_frame()->GetWebFrame();
   DCHECK(!no_frame);