angler-fishThe Vulnerability History Project

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
by Preston the Irish Setter 2013-01-17 01:50:52 UTC
commit cda790613b518dee5a3ea4ce7d83989c1acd166a
Chromium
chrome/browser/automation/automation_provider.cc
+14 -56
chrome/browser/download/chrome_download_manager_delegate.cc
+1 -3
chrome/browser/download/download_item_model.cc
+1 -3
chrome/browser/download/download_item_model_unittest.cc
+4 -4
chrome/browser/download/download_query.cc
+1 -2
chrome/browser/download/download_query_unittest.cc
+8 -8
chrome/browser/download/download_shelf_unittest.cc
+2
chrome/browser/extensions/api/downloads/downloads_api.cc
+2 -4
chrome/browser/ui/cocoa/download/download_shelf_controller.mm
+2 -1
chrome/browser/ui/gtk/download/download_shelf_gtk.cc
+2 -1
chrome/browser/ui/views/download/download_item_view.cc
+1 -3
chrome/browser/ui/views/download/download_shelf_view.cc
+2 -1
chrome/browser/ui/webui/downloads_dom_handler.cc
+5 -3
chrome/test/pyautolib/pyauto.py
+1 -1
content/browser/download/download_item_impl.cc
+42 -16
content/browser/download/download_item_impl.h
+5
content/browser/download/download_item_impl_unittest.cc
+1 -1
content/browser/download/download_manager_impl.cc
+2 -1
content/browser/download/download_manager_impl_unittest.cc
+3 -2
content/browser/download/download_net_log_parameters.cc
+13 -2
content/browser/download/download_net_log_parameters.h
+1
content/browser/download/download_stats.h
+1
content/public/browser/download_danger_type.h
-4
content/public/browser/download_item.h
+12 -2
content/public/test/download_test_observer.cc
+1 -1
content/public/test/mock_download_item.h
+1
net/base/net_log_event_type_list.h
+5 -3
expand_less