summaryrefslogtreecommitdiff
path: root/content/browser/download/download_file_unittest.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-08-23 16:39:15 +0100
committerTorne (Richard Coles) <torne@google.com>2013-08-23 16:39:15 +0100
commit3551c9c881056c480085172ff9840cab31610854 (patch)
tree23660320f5f4c279966609cf9da7491b96d10ca8 /content/browser/download/download_file_unittest.cc
parent4e9d9adbbb6cf287125ca44a0823791a570472f5 (diff)
downloadchromium_org-3551c9c881056c480085172ff9840cab31610854.tar.gz
Merge from Chromium at DEPS revision r219274
This commit was generated by merge_to_master.py. Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
Diffstat (limited to 'content/browser/download/download_file_unittest.cc')
-rw-r--r--content/browser/download/download_file_unittest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc
index 867b76f6fe..49e418c85b 100644
--- a/content/browser/download/download_file_unittest.cc
+++ b/content/browser/download/download_file_unittest.cc
@@ -76,6 +76,7 @@ class DownloadFileTest : public testing::Test {
DownloadFileTest() :
observer_(new StrictMock<MockDownloadDestinationObserver>),
observer_factory_(observer_.get()),
+ input_stream_(NULL),
bytes_(-1),
bytes_per_sec_(-1),
hash_state_("xyzzy"),