Revert of Bug fix in sampling whitelisted download.

chrome/browser/safe_browsing/download_protection_service_unittest.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 <stdint.h>
 #include <map>
 #include <string>
@@ skipping 628 matching lines @@
   // Set sample rate to 0 to prevent sampling.
   SetWhitelistedDownloadSampleRate(0);
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
 
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
   EXPECT_TRUE(HasClientDownloadRequest());
-  EXPECT_FALSE(GetClientDownloadRequest()->skipped_url_whitelist());
-  EXPECT_FALSE(GetClientDownloadRequest()->skipped_certificate_whitelist());
   ClearClientDownloadRequest();
 
   // Check that the referrer is not matched against the whitelist.
   referrer_ = GURL("http://www.google.com/");
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
 
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
   EXPECT_TRUE(HasClientDownloadRequest());
-  EXPECT_FALSE(GetClientDownloadRequest()->skipped_url_whitelist());
-  EXPECT_FALSE(GetClientDownloadRequest()->skipped_certificate_whitelist());
   ClearClientDownloadRequest();
 
   // Redirect from a site shouldn't be checked either.
   url_chain_.insert(url_chain_.begin(), GURL("http://www.google.com/redirect"));
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
 
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
   EXPECT_TRUE(HasClientDownloadRequest());
-  EXPECT_FALSE(GetClientDownloadRequest()->skipped_url_whitelist());
-  EXPECT_FALSE(GetClientDownloadRequest()->skipped_certificate_whitelist());
   ClearClientDownloadRequest();
 
   // Only if the final url is whitelisted should it be SAFE.
   url_chain_.push_back(GURL("http://www.google.com/a.exe"));
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
@@ skipping 1221 matching lines @@
       &item, base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                         base::Unretained(this)));
   MessageLoop::current()->Run();
 
   EXPECT_FALSE(HasClientDownloadRequest());
   // Overriden by flag:
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
 }
 
 }  // namespace safe_browsing