Fix page transition qualifiers not masked out

chrome/browser/tab_contents/navigation_metrics_recorder.cc

 // Copyright (c) 2012 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/tab_contents/navigation_metrics_recorder.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/origins_seen_service_factory.h"
@@ skipping 36 matching lines @@
   const url::Origin origin(details.entry->GetVirtualURL());
   bool have_already_seen_origin = service->Insert(origin);
 
   navigation_metrics::RecordMainFrameNavigation(
       details.entry->GetVirtualURL(), details.is_in_page,
       context->IsOffTheRecord(), have_already_seen_origin);
 
   // Record the domain and registry of the URL that resulted in a navigation to
   // a |data:| URL, either by redirects or user clicking a link.
   if (details.entry->GetVirtualURL().SchemeIs(url::kDataScheme) &&
-      params.transition != ui::PAGE_TRANSITION_TYPED &&
+      !ui::PageTransitionCoreTypeIs(params.transition,
+                                    ui::PAGE_TRANSITION_TYPED) &&
       !details.previous_url.is_empty()) {
     rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                             "Navigation.Scheme.Data",
                                             details.previous_url);
   }
 }