Make PageLoadMetricsWaiter more resilient

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>
@@ skipping 414 matching lines @@
        ui::PAGE_TRANSITION_CLIENT_REDIRECT) != 0 &&
       committed_load_) {
     // TODO(bmcquade): consider carrying the user_gesture bit forward to the
     // redirected navigation.
     committed_load_->NotifyClientRedirectTo(*tracker);
   }
 
   committed_load_ = std::move(tracker);
   committed_load_->Commit(navigation_handle);
   DCHECK(committed_load_->did_commit());
+
+  for (auto& observer : testing_observers_)

[Charlie Harrison, 2017/05/25 19:35:33]

nit: for loops in the file generally have braces.

[Bryan McQuade, 2017/05/25 19:54:05]

All of the other testing observer for loops don't use braces, so if it's ok I'd
like to stay consistent with those.

[Charlie Harrison, 2017/05/25 19:59:44]

Ah yea, only looked at those for loops close to this one. We should standardize
it in PLM code at some point but this is fine.

+    observer.OnCommit(committed_load_.get());
 }
 
 void MetricsWebContentsObserver::NavigationStopped() {
   // TODO(csharrison): Use a more user-initiated signal for STOP.
   NotifyPageEndAllLoads(END_STOP, UserInitiatedInfo::NotUserInitiated());
 }
 
 void MetricsWebContentsObserver::OnInputEvent(
     const blink::WebInputEvent& event) {
   // Ignore browser navigation or reload which comes with type Undefined.
@@ skipping 162 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);
-  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);
 
   for (auto& observer : testing_observers_)
@@ skipping 44 matching lines @@
     observer_->RemoveTestingObserver(this);
     observer_ = nullptr;
   }
 }
 
 void MetricsWebContentsObserver::TestingObserver::OnGoingAway() {
   observer_ = nullptr;
 }
 
 }  // namespace page_load_metrics