[Payments] Display origin for initial loading and navigating

Baug: 840759
Change-Id: Ibade40328413f8dbd9a7518f7af692322d172b49
Reviewed-on: https://chromium-review.googlesource.com/1048982
Commit-Queue: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557187}

chrome/browser/ui/views/payments/payment_handler_web_flow_view_controller.cc

@@ -194,8 +194,9 @@ bool PaymentHandlerWebFlowViewController::ShouldShowSecondaryButton() {
 
 std::unique_ptr<views::View>
 PaymentHandlerWebFlowViewController::CreateHeaderContentView() {
-  const GURL origin =
-      web_contents() ? web_contents()->GetVisibleURL().GetOrigin() : GURL();
+  const GURL origin = web_contents()
+                          ? web_contents()->GetVisibleURL().GetOrigin()
+                          : target_.GetOrigin();
   std::unique_ptr<views::Background> background = GetHeaderBackground();
   return std::make_unique<ReadOnlyOriginView>(
       GetSheetTitle(), origin,
@@ -224,6 +225,11 @@ void PaymentHandlerWebFlowViewController::ButtonPressed(
   }
 }
 
+void PaymentHandlerWebFlowViewController::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  UpdateHeaderView();
+}
+
 void PaymentHandlerWebFlowViewController::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (!OriginSecurityChecker::IsOriginSecure(navigation_handle->GetURL()) ||

chrome/browser/ui/views/payments/payment_handler_web_flow_view_controller.h

@@ -48,6 +48,8 @@ class PaymentHandlerWebFlowViewController
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // content::WebContentsObserver:
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
   void TitleWasSet(content::NavigationEntry* entry) override;