Portals: Fix token ordering in CreatePortalCallback callsites

Issue was pointed out in crbug.com/1096617. We currently return the
frame's token as the portal token (and vice-versa) to the renderer
through the CreatePortal callback.

Change-Id: I66bfc503e1ff31462002212a4cfd093c7a83d0a0
Bug: 1096617
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2305832Reviewed-by: Lucas Gadani <lfg@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790582}

content/browser/frame_host/render_frame_host_impl.cc

@@ -4909,7 +4909,7 @@ void RenderFrameHostImpl::CreatePortal(
   DCHECK(initial_replicated_state.origin.opaque());
 
   std::move(callback).Run(proxy_host->GetRoutingID(), initial_replicated_state,
-                          proxy_host->GetFrameToken(), (*it)->portal_token(),
+                          (*it)->portal_token(), proxy_host->GetFrameToken(),
                           (*it)->GetDevToolsFrameToken());
 }
 

content/test/portal/portal_created_observer.cc

@@ -44,7 +44,7 @@ void PortalCreatedObserver::CreatePortal(
   std::move(callback).Run(
       proxy_host->GetRoutingID(),
       proxy_host->frame_tree_node()->current_replication_state(),
-      proxy_host->GetFrameToken(), portal_->portal_token(),
+      portal_->portal_token(), proxy_host->GetFrameToken(),
       portal_->GetDevToolsFrameToken());
 
   DidCreatePortal();