Add download server IP address to the SafeBrowsing download protection ping.

chrome/browser/safe_browsing/download_protection_service.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 140 matching lines @@
 DownloadProtectionService::DownloadInfo
 DownloadProtectionService::DownloadInfo::FromDownloadItem(
     const DownloadItem& item) {
   DownloadInfo download_info;
   download_info.target_file = item.GetTargetFilePath();
   download_info.sha256_hash = item.GetHash();
   download_info.local_file = item.GetFullPath();
   download_info.download_url_chain = item.GetUrlChain();
   download_info.referrer_url = item.GetReferrerUrl();
   download_info.total_bytes = item.GetTotalBytes();
-  // TODO(bryner): Populate user_initiated
+  download_info.remote_address = item.GetRemoteAddress();
+  download_info.user_initiated = item.GetStateInfo().has_user_gesture;
   return download_info;
 }
 
 // Parent SafeBrowsing::Client class used to lookup the bad binary
 // URL and digest list.  There are two sub-classes (one for each list).
 class DownloadSBClient
     : public SafeBrowsingService::Client,
       public base::RefCountedThreadSafe<DownloadSBClient> {
  public:
   DownloadSBClient(
@@ skipping 396 matching lines @@
     request.set_url(info_.download_url_chain.back().spec());
     request.mutable_digests()->set_sha256(info_.sha256_hash);
     request.set_length(info_.total_bytes);
     for (size_t i = 0; i < info_.download_url_chain.size(); ++i) {
       ClientDownloadRequest::Resource* resource = request.add_resources();
       resource->set_url(info_.download_url_chain[i].spec());
       if (i == info_.download_url_chain.size() - 1) {
         // The last URL in the chain is the download URL.
         resource->set_type(ClientDownloadRequest::DOWNLOAD_URL);
         resource->set_referrer(info_.referrer_url.spec());
+        if (!info_.remote_address.empty()) {
+          resource->set_remote_ip(info_.remote_address);
+        }
       } else {
         resource->set_type(ClientDownloadRequest::DOWNLOAD_REDIRECT);
       }
       // TODO(noelutz): fill out the remote IP addresses.
     }
     request.set_user_initiated(info_.user_initiated);
     request.mutable_signature()->CopyFrom(signature_info_);
     std::string request_data;
     if (!request.SerializeToString(&request_data)) {
       RecordImprovedProtectionStats(REASON_INVALID_REQUEST_PROTO);
@@ skipping 243 matching lines @@
 
   std::string issuer_fp = base::HexEncode(issuer.fingerprint().data,
                                           sizeof(issuer.fingerprint().data));
   for (std::set<std::string>::iterator it = paths_to_check.begin();
        it != paths_to_check.end(); ++it) {
     whitelist_strings->push_back("cert/" + issuer_fp + *it);
   }
 }
 
 }  // namespace safe_browsing