Include the full certificate chain in the download pingback.

chrome/browser/safe_browsing/download_protection_service_unittest.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 <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 45 matching lines @@
   virtual ~MockSignatureUtil() {}
   MOCK_METHOD2(CheckSignature,
                void(const FilePath&, ClientDownloadRequest_SignatureInfo*));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSignatureUtil);
 };
 }  // namespace
 
 ACTION_P(SetCertificateContents, contents) {
-  arg1->set_certificate_contents(contents);
+  arg1->add_certificate_chain()->add_element()->set_certificate(contents);
 }
 
 // We can't call OnSafeBrowsingResult directly because SafeBrowsingCheck does
 // not have any copy constructor which means it can't be stored in a callback
 // easily.  Note: check will be deleted automatically when the callback is
 // deleted.
 void OnSafeBrowsingResult(SafeBrowsingService::SafeBrowsingCheck* check) {
   check->client->OnSafeBrowsingResult(*check);
 }
 
@@ skipping 300 matching lines @@
   EXPECT_EQ(info.user_initiated, request.user_initiated());
   EXPECT_EQ(2, request.resources_size());
   EXPECT_TRUE(RequestContainsResource(request,
                                       ClientDownloadRequest::DOWNLOAD_REDIRECT,
                                       "http://www.google.com/", ""));
   EXPECT_TRUE(RequestContainsResource(request,
                                       ClientDownloadRequest::DOWNLOAD_URL,
                                       "http://www.google.com/bla.exe",
                                       info.referrer_url.spec()));
   EXPECT_TRUE(request.has_signature());
-  EXPECT_TRUE(request.signature().has_certificate_contents());
-  EXPECT_EQ("dummy cert data", request.signature().certificate_contents());
+  ASSERT_EQ(1, request.signature().certificate_chain_size());
+  const ClientDownloadRequest_CertificateChain& chain =
+      request.signature().certificate_chain(0);
+  ASSERT_EQ(1, chain.element_size());
+  EXPECT_EQ("dummy cert data", chain.element(0).certificate());
 
   // Simulate the request finishing.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&DownloadProtectionServiceTest::SendURLFetchComplete,
                  base::Unretained(this), fetcher));
   msg_loop_.Run();
 }
 
 // Similar to above, but with an unsigned binary.
@@ skipping 31 matching lines @@
   EXPECT_EQ(info.user_initiated, request.user_initiated());
   EXPECT_EQ(2, request.resources_size());
   EXPECT_TRUE(RequestContainsResource(request,
                                       ClientDownloadRequest::DOWNLOAD_REDIRECT,
                                       "http://www.google.com/", ""));
   EXPECT_TRUE(RequestContainsResource(request,
                                       ClientDownloadRequest::DOWNLOAD_URL,
                                       "http://www.google.com/bla.exe",
                                       info.referrer_url.spec()));
   EXPECT_TRUE(request.has_signature());
-  EXPECT_FALSE(request.signature().has_certificate_contents());
+  EXPECT_EQ(0, request.signature().certificate_chain_size());
 
   // Simulate the request finishing.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&DownloadProtectionServiceTest::SendURLFetchComplete,
                  base::Unretained(this), fetcher));
   msg_loop_.Run();
 }
 
 TEST_F(DownloadProtectionServiceTest, CheckClientDownloadDigestList) {
@@ skipping 154 matching lines @@
           CheckDownloadUrlDone(SafeBrowsingService::BINARY_MALWARE_URL),
           Return(false)));
   download_service_->CheckDownloadUrl(
       info,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_EQ(DownloadProtectionService::DANGEROUS, result_);
 }
 }  // namespace safe_browsing