Handle about:blank in the Origin Info Bubble better.

content/browser/frame_host/navigation_controller_impl.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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 1095 matching lines @@
     // the URL.
     update_virtual_url = needs_update;
   }
 
   // Don't use the page type from the pending entry. Some interstitial page
   // may have set the type to interstitial. Once we commit, however, the page
   // type must always be normal or error.
   new_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
                                                      : PAGE_TYPE_NORMAL);
   new_entry->SetURL(params.url);
+  new_entry->SetOrigin(url::Origin(params.url));

[Charlie Reis, 2016/04/19 22:32:52]

Oh, I missed this before.  This is wrong-- it'll be about:blank in the case we
care about.  Instead, this should be params.origin, so that we capture the
effective origin.  (I think it's worth adding the tests now, since they would
have caught this.)

Same in the cases below.

   if (update_virtual_url)
     UpdateVirtualURLToURL(new_entry.get(), params.url);
   new_entry->SetReferrer(params.referrer);
   new_entry->SetPageID(params.page_id);
   new_entry->SetTransitionType(params.transition);
   new_entry->set_site_instance(
       static_cast<SiteInstanceImpl*>(rfh->GetSiteInstance()));
   new_entry->SetOriginalRequestURL(params.original_request_url);
   new_entry->SetIsOverridingUserAgent(params.is_overriding_user_agent);
 
@@ skipping 47 matching lines @@
     // navigations that are EXISTING_PAGE are reloads and location.replace,
     // which land us at the last committed entry.
     entry = GetLastCommittedEntry();
   }
   DCHECK(entry);
 
   // The URL may have changed due to redirects.
   entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
                                                  : PAGE_TYPE_NORMAL);
   entry->SetURL(params.url);
+  entry->SetOrigin(url::Origin(params.url));
   entry->SetReferrer(params.referrer);
   if (entry->update_virtual_url_with_url())
     UpdateVirtualURLToURL(entry, params.url);
 
   // Update the post parameters.
   FrameNavigationEntry* frame_entry =
       entry->GetFrameEntry(rfh->frame_tree_node());
   frame_entry->set_method(params.method);
   frame_entry->set_post_id(params.post_id);
 
@@ skipping 41 matching lines @@
   // a regular user-initiated navigation.
   DCHECK_EQ(pending_entry_->GetUniqueID(), params.nav_entry_id);
   existing_entry->set_unique_id(pending_entry_->GetUniqueID());
 
   // The URL may have changed due to redirects.
   existing_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
                                                           : PAGE_TYPE_NORMAL);
   if (existing_entry->update_virtual_url_with_url())
     UpdateVirtualURLToURL(existing_entry, params.url);
   existing_entry->SetURL(params.url);
+  existing_entry->SetOrigin(url::Origin(params.url));
   existing_entry->SetReferrer(params.referrer);
 
   // The page may have been requested with a different HTTP method.
   FrameNavigationEntry* frame_entry =
       existing_entry->GetFrameEntry(rfh->frame_tree_node());
   frame_entry->set_method(params.method);
   frame_entry->set_post_id(params.post_id);
 
   DiscardNonCommittedEntries();
 }
@@ skipping 794 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content