| Index: chrome/browser/download/download_browsertest.cc
|
| diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
|
| index bad5771c7e62407b22c580b0e946c7df310034b0..5a300cb36cc7ec1440cf2b5378331cecf3ba97d9 100644
|
| --- a/chrome/browser/download/download_browsertest.cc
|
| +++ b/chrome/browser/download/download_browsertest.cc
|
| @@ -109,8 +109,7 @@
|
| #if defined(FULL_SAFE_BROWSING)
|
| #include "chrome/browser/safe_browsing/download_feedback_service.h"
|
| #include "chrome/browser/safe_browsing/download_protection_service.h"
|
| -#include "chrome/browser/safe_browsing/safe_browsing_database.h"
|
| -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
| +#include "chrome/browser/safe_browsing/test_safe_browsing_service.h"
|
| #endif
|
|
|
| using content::BrowserContext;
|
| @@ -1088,7 +1087,7 @@ class FakeDownloadProtectionService
|
| };
|
|
|
| class FakeSafeBrowsingService
|
| - : public safe_browsing::SafeBrowsingService,
|
| + : public safe_browsing::TestSafeBrowsingService,
|
| public safe_browsing::ServicesDelegate::ServicesCreator {
|
| public:
|
| FakeSafeBrowsingService() {
|
| @@ -1096,8 +1095,6 @@ class FakeSafeBrowsingService
|
| safe_browsing::ServicesDelegate::CreateForTest(this, this);
|
| }
|
|
|
| - std::string GetDownloadReport() const { return report_; }
|
| -
|
| protected:
|
| ~FakeSafeBrowsingService() override {}
|
|
|
| @@ -1120,13 +1117,6 @@ class FakeSafeBrowsingService
|
| return nullptr;
|
| }
|
|
|
| - // SafeBrowsingService:
|
| - void SendSerializedDownloadReport(const std::string& report) override {
|
| - report_ = report;
|
| - }
|
| -
|
| - std::string report_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(FakeSafeBrowsingService);
|
| };
|
|
|
| @@ -3379,7 +3369,7 @@ IN_PROC_BROWSER_TEST_F(
|
| safe_browsing::ClientSafeBrowsingReportRequest actual_report;
|
| actual_report.ParseFromString(
|
| test_safe_browsing_factory_->fake_safe_browsing_service()
|
| - ->GetDownloadReport());
|
| + ->serilized_download_report());
|
| EXPECT_EQ(safe_browsing::ClientSafeBrowsingReportRequest::
|
| DANGEROUS_DOWNLOAD_WARNING,
|
| actual_report.type());
|
| @@ -3412,9 +3402,9 @@ IN_PROC_BROWSER_TEST_F(
|
| DownloadItem* download = downloads[0];
|
| DownloadCommands(download).ExecuteCommand(DownloadCommands::DISCARD);
|
|
|
| - EXPECT_TRUE(
|
| - test_safe_browsing_factory_->fake_safe_browsing_service()
|
| - ->GetDownloadReport().empty());
|
| + EXPECT_TRUE(test_safe_browsing_factory_->fake_safe_browsing_service()
|
| + ->serilized_download_report()
|
| + .empty());
|
| }
|
| #endif // FULL_SAFE_BROWSING
|
|
|
|
|