diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /content/browser/download/download_file_unittest.cc | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'content/browser/download/download_file_unittest.cc')
| -rw-r--r-- | content/browser/download/download_file_unittest.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index f92bb02e43..604baa4ea0 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -131,16 +131,15 @@ class DownloadFileTest : public testing::Test { scoped_ptr<DownloadSaveInfo> save_info(new DownloadSaveInfo()); download_file_.reset( - new DownloadFileImpl( - save_info.Pass(), - base::FilePath(), - GURL(), // Source - GURL(), // Referrer - calculate_hash, - scoped_ptr<ByteStreamReader>(input_stream_), - net::BoundNetLog(), - scoped_ptr<PowerSaveBlocker>(NULL).Pass(), - observer_factory_.GetWeakPtr())); + new DownloadFileImpl(save_info.Pass(), + base::FilePath(), + GURL(), // Source + GURL(), // Referrer + calculate_hash, + scoped_ptr<ByteStreamReader>(input_stream_), + net::BoundNetLog(), + scoped_ptr<PowerSaveBlocker>().Pass(), + observer_factory_.GetWeakPtr())); EXPECT_CALL(*input_stream_, Read(_, _)) .WillOnce(Return(ByteStreamReader::STREAM_EMPTY)) |