Index: content/browser/download/download_manager_impl_unittest.cc |
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc |
index 2012e4bd555146d006c49787e2df9d27471ba6ef..c0f1232ed5bb98dd6d17e081cd59ddfa5941fd0a 100644 |
--- a/content/browser/download/download_manager_impl_unittest.cc |
+++ b/content/browser/download/download_manager_impl_unittest.cc |
@@ -7,6 +7,7 @@ |
#include <stddef.h> |
#include <stdint.h> |
+#include <map> |
#include <memory> |
#include <set> |
#include <string> |
@@ -143,7 +144,7 @@ class MockDownloadItemImpl : public DownloadItemImpl { |
MOCK_CONST_METHOD0(GetFullPath, const base::FilePath&()); |
MOCK_CONST_METHOD0(GetTargetFilePath, const base::FilePath&()); |
MOCK_CONST_METHOD0(GetTargetDisposition, TargetDisposition()); |
- MOCK_METHOD1(OnContentCheckCompleted, void(DownloadDangerType)); |
+ MOCK_METHOD2(OnContentCheckCompleted, void(DownloadDangerType, bool)); |
MOCK_CONST_METHOD0(GetState, DownloadState()); |
MOCK_CONST_METHOD0(GetUrlChain, const std::vector<GURL>&()); |
MOCK_METHOD1(SetTotalBytes, void(int64_t)); |
@@ -404,7 +405,7 @@ class MockDownloadFileFactory |
MOCK_METHOD2(MockCreateFile, |
MockDownloadFile*(const DownloadSaveInfo&, ByteStreamReader*)); |
- virtual DownloadFile* CreateFile( |
+ DownloadFile* CreateFile( |
std::unique_ptr<DownloadSaveInfo> save_info, |
const base::FilePath& default_download_directory, |
std::unique_ptr<ByteStreamReader> byte_stream, |
@@ -439,9 +440,9 @@ class MockBrowserContext : public BrowserContext { |
net::URLRequestContextGetter*( |
const base::FilePath& partition_path, bool in_memory)); |
- // Define these two methods to avoid a |
- // cannot access private member declared in class 'ScopedVector<net::URLRequestInterceptor>' |
- // build error if they're put in MOCK_METHOD. |
+ // Define these two methods to avoid a cannot access private member declared |
+ // in class 'ScopedVector<net::URLRequestInterceptor>' build error if they're |
+ // put in MOCK_METHOD. |
net::URLRequestContextGetter* CreateRequestContext( |
ProtocolHandlerMap* protocol_handlers, |
URLRequestInterceptorScopedVector request_interceptors) override { |