From 7d4cd473f85ac64c3747c96c277f9e506a0d2246 Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Wed, 19 Jun 2013 11:58:07 +0100
Subject: Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
---
 content/browser/download/download_file_unittest.cc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'content/browser/download/download_file_unittest.cc')

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))
-- 
cgit v1.2.3