Fix page transition qualifiers not masked out

content/test/test_render_frame_host.cc

 // Copyright 2013 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 "content/test/test_render_frame_host.h"
 
 #include "base/guid.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 300 matching lines @@
 
   // In most cases, the origin will match the URL's origin.  Tests that need to
   // check corner cases (like about:blank) should specify the origin param
   // manually.
   url::Origin origin(url_copy);
   params.origin = origin;
 
   url::Replacements<char> replacements;
   replacements.ClearRef();
   params.was_within_same_page =
-      transition != ui::PAGE_TRANSITION_RELOAD &&
-      transition != ui::PAGE_TRANSITION_TYPED &&
+      !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) &&
+      !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_TYPED) &&
       url_copy.ReplaceComponents(replacements) ==
           GetLastCommittedURL().ReplaceComponents(replacements);
 
   params.page_state =
       PageState::CreateForTesting(url_copy, false, nullptr, nullptr);
 
   if (!callback.is_null())
     callback.Run(&params);
 
   SendNavigateWithParams(&params);
@@ skipping 98 matching lines @@
   // cleared during DidFailProvisionalLoad).
   int page_id = entry ? entry->GetPageID() : -1;
   if (page_id == -1) {
     WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
     page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
   }
   return page_id;
 }
 
 }  // namespace content