Capture http to https navigations w/ intent picker

chrome/browser/chromeos/arc/arc_navigation_throttle.cc

 // Copyright 2016 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/chromeos/arc/arc_navigation_throttle.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 101 matching lines @@
   // don't have a way to send POST data to ARC, and 2) intercepting http(s) form
   // submissions is not very important because such submissions are usually
   // done within the same domain. ShouldOverrideUrlLoading() below filters out
   // such submissions anyway.
   constexpr bool kAllowFormSubmit = false;
 
   if (ShouldIgnoreNavigation(navigation_handle()->GetPageTransition(),
                              kAllowFormSubmit))
     return content::NavigationThrottle::PROCEED;
 
-  const GURL previous_url = navigation_handle()->GetReferrer().url;
+  const GURL referrer_url = navigation_handle()->GetReferrer().url;
   const GURL current_url = navigation_handle()->GetURL();
+  const GURL last_committed_url =
+      navigation_handle()->GetWebContents()->GetLastCommittedURL();
+
+  // For navigations from http to https we clean up the Referrer as part of the
+  // sanitization proccess, however we may still have access to the last
+  // committed URL. We don't use GetVisibleURL() since it may contains a still

[Yusuke Sato, 2016/10/20 15:20:53]

nit: contain?

[djacobo_, 2016/10/20 18:38:14]

Done.

+  // non-committed URL (i.e. it can be the same as GetURL()).
+  const GURL previous_url =
+      referrer_url.is_empty() ? last_committed_url : referrer_url;

[Yusuke Sato, 2016/10/20 15:20:52]

qq: We still need the is_empty() check because there are cases where
referrer_url is not empty but last_committed_url is empty, correct? When does
that happen? Probably a new tab or window is created for the navigation (e.g.
with <a href=... target="_blank">)?

[djacobo_, 2016/10/20 18:38:14]

Correct, the navigation started with target="_blank" will have no past entries
for a new tab, so last_committed_url can be empty whereas referrer preserves a
value.

[Yusuke Sato, 2016/10/20 19:32:05]

Can you mention this in the code comment?

[djacobo_, 2016/10/20 20:07:31]

Done.

+
   if (!ShouldOverrideUrlLoading(previous_url, current_url))
     return content::NavigationThrottle::PROCEED;
 
   ArcServiceManager* arc_service_manager = ArcServiceManager::Get();
   DCHECK(arc_service_manager);
   scoped_refptr<LocalActivityResolver> local_resolver =
       arc_service_manager->activity_resolver();
   if (local_resolver->ShouldChromeHandleUrl(url)) {
     // Allow navigation to proceed if there isn't an android app that handles
     // the given URL.
@@ skipping 159 matching lines @@
 }
 
 // static
 bool ArcNavigationThrottle::ShouldOverrideUrlLoadingForTesting(
     const GURL& previous_url,
     const GURL& current_url) {
   return ShouldOverrideUrlLoading(previous_url, current_url);
 }
 
 }  // namespace arc