Factor management of metrics updates into its own class.

chrome/browser/page_load_metrics/metrics_web_contents_observer.cc

 // Copyright 2015 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/page_load_metrics/metrics_web_contents_observer.h"
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/page_load_metrics/browser_page_track_decider.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_embedder_interface.h"
+#include "chrome/browser/page_load_metrics/page_load_metrics_update_dispatcher.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
 #include "chrome/browser/page_load_metrics/page_load_tracker.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/page_load_metrics/page_load_metrics_messages.h"
 #include "chrome/common/page_load_metrics/page_load_timing.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 291 matching lines @@
   return committed_load_->ComputePageLoadExtraInfo();
 }
 
 void MetricsWebContentsObserver::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (!navigation_handle->IsInMainFrame()) {
     if (committed_load_ && navigation_handle->GetParentFrame() &&
         GetMainFrame(navigation_handle->GetParentFrame()) ==
             web_contents()->GetMainFrame()) {
       committed_load_->DidFinishSubFrameNavigation(navigation_handle);
+      committed_load_->metrics_update_dispatcher()->DidFinishSubFrameNavigation(
+          navigation_handle);
     }
     return;
   }
 
   std::unique_ptr<PageLoadTracker> finished_nav(
       std::move(provisional_loads_[navigation_handle]));
   provisional_loads_.erase(navigation_handle);
 
   // Ignore same-document navigations.
   if (navigation_handle->HasCommitted() &&
@@ skipping 263 matching lines @@
   }
 
   if (!web_contents()->GetLastCommittedURL().SchemeIsHTTPOrHTTPS()) {
     RecordInternalError(ERR_IPC_FROM_BAD_URL_SCHEME);
     error = true;
   }
 
   if (error)
     return;
 
+  committed_load_->metrics_update_dispatcher()->UpdateMetrics(render_frame_host,
+                                                              timing, metadata);
+
   const bool is_main_frame = (render_frame_host->GetParent() == nullptr);
-  if (is_main_frame) {
-    committed_load_->UpdateTiming(timing, metadata);
-  } else {
-    committed_load_->UpdateSubFrameTiming(render_frame_host, timing, metadata);
-  }
-
   for (auto& observer : testing_observers_)
     observer.OnTimingUpdated(is_main_frame, timing, metadata);
 }
 
 void MetricsWebContentsObserver::OnUpdateTimingOverIPC(
     content::RenderFrameHost* render_frame_host,
     const mojom::PageLoadTiming& timing,
     const mojom::PageLoadMetadata& metadata) {
   DCHECK(!base::FeatureList::IsEnabled(features::kPageLoadMetricsMojofication));
   OnTimingUpdated(render_frame_host, timing, metadata);
@@ skipping 46 matching lines @@
     observer_->RemoveTestingObserver(this);
     observer_ = nullptr;
   }
 }
 
 void MetricsWebContentsObserver::TestingObserver::OnGoingAway() {
   observer_ = nullptr;
 }
 
 }  // namespace page_load_metrics