summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_shelf_unittest.cc
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 01:50:52 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 01:50:52 +0000
commitcda790613b518dee5a3ea4ce7d83989c1acd166a (patch)
tree63559cfe77454c489e41c1f69bd685e09d68cc78 /chrome/browser/download/download_shelf_unittest.cc
parent155727895a28eabf46792cf1934d6e0b6db11ee3 (diff)
downloadchromium_src-cda790613b518dee5a3ea4ce7d83989c1acd166a.zip
chromium_src-cda790613b518dee5a3ea4ce7d83989c1acd166a.tar.gz
chromium_src-cda790613b518dee5a3ea4ce7d83989c1acd166a.tar.bz2
Merge DownloadItem::SafetyState and DownloadDangerType
R=asanka@chromium.org R=benjhayden@chromium.org Review URL: https://chromiumcodereview.appspot.com/11693011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_shelf_unittest.cc')
-rw-r--r--chrome/browser/download/download_shelf_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/download/download_shelf_unittest.cc b/chrome/browser/download/download_shelf_unittest.cc
index b77326e..f968e35 100644
--- a/chrome/browser/download/download_shelf_unittest.cc
+++ b/chrome/browser/download/download_shelf_unittest.cc
@@ -53,8 +53,6 @@ DownloadShelfTest::DownloadShelfTest()
ON_CALL(*download_item_, GetAutoOpened()).WillByDefault(Return(false));
ON_CALL(*download_item_, GetMimeType()).WillByDefault(Return("text/plain"));
ON_CALL(*download_item_, GetOpenWhenComplete()).WillByDefault(Return(false));
- ON_CALL(*download_item_, GetSafetyState())
- .WillByDefault(Return(DownloadItem::SAFE));
ON_CALL(*download_item_, GetTargetDisposition())
.WillByDefault(Return(DownloadItem::TARGET_DISPOSITION_OVERWRITE));
ON_CALL(*download_item_, GetURL())