Add CLIENT_REDIRECT variants for page load metrics abort types

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 173 matching lines @@
 }
 
 void RecordAppBackgroundPageLoadCompleted(bool completed_after_background) {
   UMA_HISTOGRAM_BOOLEAN(internal::kPageLoadCompletedAfterAppBackground,
                         completed_after_background);
 }
 
 // TODO(csharrison): Add a case for client side redirects, which is what JS
 // initiated window.location / window.history navigations get set to.
 UserAbortType AbortTypeForPageTransition(ui::PageTransition transition) {
+  if (transition & ui::PAGE_TRANSITION_CLIENT_REDIRECT) {
+    return ABORT_CLIENT_REDIRECT;
+  }
   if (ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD))
     return ABORT_RELOAD;
   if (transition & ui::PAGE_TRANSITION_FORWARD_BACK)
     return ABORT_FORWARD_BACK;
   if (ui::PageTransitionIsNewNavigation(transition))
     return ABORT_NEW_NAVIGATION;
   NOTREACHED()
       << "AbortTypeForPageTransition received unexpected ui::PageTransition: "
       << transition;
   return ABORT_OTHER;
@@ skipping 123 matching lines @@
       final_navigation->GetPageTransition();
   switch (AbortTypeForPageTransition(committed_transition)) {
     case ABORT_RELOAD:
       UMA_HISTOGRAM_COUNTS(internal::kAbortChainSizeReload,
                            aborted_chain_size_);
       return;
     case ABORT_FORWARD_BACK:
       UMA_HISTOGRAM_COUNTS(internal::kAbortChainSizeForwardBack,
                            aborted_chain_size_);
       return;
+    // TODO(csharrison): Refactor this code so it is based on the WillStart*
+    // code path instead of the committed load code path. Then, for every abort
+    // chain, log a histogram of the counts of each of these metrics. For now,
+    // merge client redirects with new navigations, which was (basically) the
+    // previous behavior.
+    case ABORT_CLIENT_REDIRECT:
     case ABORT_NEW_NAVIGATION:
       UMA_HISTOGRAM_COUNTS(internal::kAbortChainSizeNewNavigation,
                            aborted_chain_size_);
       return;
     default:
       NOTREACHED()
           << "LogAbortChainHistograms received unexpected ui::PageTransition: "
           << committed_transition;
       return;
   }
@@ skipping 640 matching lines @@
     if (navigation_handle->IsSamePage() || navigation_handle->IsErrorPage())
       return false;
     const std::string& mime_type = web_contents()->GetContentsMimeType();
     if (mime_type != "text/html" && mime_type != "application/xhtml+xml")
       return false;
   }
   return true;
 }
 
 }  // namespace page_load_metrics