Include all server redirects in referrer chain

chrome/browser/safe_browsing/download_protection_service.cc

 // Copyright (c) 2012 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/safe_browsing/download_protection_service.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 1222 matching lines @@
       const GURL& initiating_frame_url,
       content::WebContents* web_contents,
       const base::FilePath& default_file_path,
       const std::vector<base::FilePath::StringType>& alternate_extensions,
       Profile* profile,
       const CheckDownloadCallback& callback,
       DownloadProtectionService* service,
       scoped_refptr<SafeBrowsingDatabaseManager> database_manager)
       : requestor_url_(requestor_url),
         initiating_frame_url_(initiating_frame_url),
+        initiating_main_frame_url_(
+            web_contents ? web_contents->GetLastCommittedURL():GURL()),

[Nathan Parker, 2017/01/27 22:53:37]

nit: add spaces around :

[Jialiu Lin, 2017/01/27 23:25:06]

Done.

         tab_id_(SessionTabHelper::IdForTab(web_contents)),
         default_file_path_(default_file_path),
         alternate_extensions_(alternate_extensions),
         callback_(callback),
         service_(service),
         database_manager_(database_manager),
         start_time_(base::TimeTicks::Now()),
         supported_path_(
             GetSupportedFilePath(default_file_path, alternate_extensions)),
         weakptr_factory_(this) {
@@ skipping 114 matching lines @@
       *(request.add_alternate_extensions()) =
           base::FilePath(alternate_extension).AsUTF8Unsafe();
     }
     if (supported_path_ != default_file_path_) {
       *(request.add_alternate_extensions()) =
           base::FilePath(default_file_path_.FinalExtension()).AsUTF8Unsafe();
     }
 
     service_->AddReferrerChainToPPAPIClientDownloadRequest(
         initiating_frame_url_,
+        initiating_main_frame_url_,
         tab_id_,
         has_user_gesture_,
         &request);
 
     if (!request.SerializeToString(&client_download_request_data_)) {
       // More of an internal error than anything else. Note that the UNKNOWN
       // verdict gets interpreted as "allowed".
       Finish(RequestOutcome::REQUEST_MALFORMED, UNKNOWN);
       return;
     }
@@ skipping 106 matching lines @@
 
     return base::FilePath();
   }
 
   std::unique_ptr<net::URLFetcher> fetcher_;
   std::string client_download_request_data_;
 
   // URL of document that requested the PPAPI download.
   const GURL requestor_url_;
 
-  // URL of the frame that hosted the PPAPI plugin.
+  // URL of the frame that hosts the PPAPI plugin.
   const GURL initiating_frame_url_;
 
+  // URL of the tab that contains the initialting_frame.
+  const GURL initiating_main_frame_url_;
+
   // Tab id that associated with the PPAPI plugin, computed by
   // SessionTabHelper::IdForTab().
   int tab_id_;
 
   // If the user interacted with this PPAPI plugin to trigger the download.
   bool has_user_gesture_;
 
   // Default download path requested by the PPAPI plugin.
   const base::FilePath default_file_path_;
 
@@ skipping 324 matching lines @@
           download_url,
           download_tab_id,
           kDownloadAttributionUserGestureLimit,
           &attribution_chain);
   UMA_HISTOGRAM_COUNTS_100(
       "SafeBrowsing.ReferrerURLChainSize.DownloadAttribution",
       attribution_chain.size());
   UMA_HISTOGRAM_ENUMERATION(
       "SafeBrowsing.ReferrerAttributionResult.DownloadAttribution", result,
       SafeBrowsingNavigationObserverManager::ATTRIBUTION_FAILURE_TYPE_MAX);
+  out_request->set_download_attribution_finch_enabled(true);
   for (auto& entry : attribution_chain)
     out_request->add_referrer_chain()->Swap(entry.get());
 }
 
 void DownloadProtectionService::AddReferrerChainToPPAPIClientDownloadRequest(
   const GURL& initiating_frame_url,
+  const GURL& initiating_main_frame_url,
   int tab_id,
   bool has_user_gesture,
   ClientDownloadRequest* out_request) {
   if (!base::FeatureList::IsEnabled(
       SafeBrowsingNavigationObserverManager::kDownloadAttribution) ||
       !navigation_observer_manager_) {
     return;
   }
 
   UMA_HISTOGRAM_BOOLEAN(
       "SafeBrowsing.ReferrerHasInvalidTabID.DownloadAttribution",
       tab_id == -1);
   SafeBrowsingNavigationObserverManager::ReferrerChain attribution_chain;
   SafeBrowsingNavigationObserverManager::AttributionResult result =
       navigation_observer_manager_->IdentifyReferrerChainForPPAPIDownload(
           initiating_frame_url,
+          initiating_main_frame_url,
           tab_id,
           has_user_gesture,
           kDownloadAttributionUserGestureLimit,
           &attribution_chain);
   UMA_HISTOGRAM_COUNTS_100(
       "SafeBrowsing.ReferrerURLChainSize.PPAPIDownloadAttribution",
       attribution_chain.size());
   UMA_HISTOGRAM_ENUMERATION(
       "SafeBrowsing.ReferrerAttributionResult.PPAPIDownloadAttribution", result,
       SafeBrowsingNavigationObserverManager::ATTRIBUTION_FAILURE_TYPE_MAX);
+  out_request->set_download_attribution_finch_enabled(true);
   for (auto& entry : attribution_chain)
     out_request->add_referrer_chain()->Swap(entry.get());
 }
 
 }  // namespace safe_browsing