Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/download/download_item_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_id.h"
 #include "content/browser/download/download_id_factory.h"
 #include "content/browser/download/download_item.h"
@@ skipping 174 matching lines @@
   item->Remove();
   ASSERT_TRUE(observer.CheckUpdated());
 }
 
 TEST_F(DownloadItemTest, NotificationAfterSetFileCheckResults) {
   // Setting to safe should not trigger any notifications
   DownloadItem* safe_item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockObserver safe_observer(safe_item);
 
   DownloadStateInfo state = safe_item->state_info();;
-  state.is_dangerous_file = false;
-  state.is_dangerous_url = false;
+  state.danger = DownloadStateInfo::NOT_DANGEROUS;
   safe_item->SetFileCheckResults(state);
   ASSERT_FALSE(safe_observer.CheckUpdated());
 
   // Setting to unsafe url or unsafe file should trigger notification
   DownloadItem* unsafeurl_item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockObserver unsafeurl_observer(unsafeurl_item);
 
   state = unsafeurl_item->state_info();;
-  state.is_dangerous_file = false;
-  state.is_dangerous_url = true;
+  state.danger = DownloadStateInfo::DANGEROUS_URL;
   unsafeurl_item->SetFileCheckResults(state);
   ASSERT_TRUE(unsafeurl_observer.CheckUpdated());
 
   unsafeurl_item->DangerousDownloadValidated();
   ASSERT_TRUE(unsafeurl_observer.CheckUpdated());
 
   DownloadItem* unsafefile_item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockObserver unsafefile_observer(unsafefile_item);
 
   state = unsafefile_item->state_info();;
-  state.is_dangerous_file = true;
-  state.is_dangerous_url = false;
+  state.danger = DownloadStateInfo::DANGEROUS_FILE;
   unsafefile_item->SetFileCheckResults(state);
   ASSERT_TRUE(unsafefile_observer.CheckUpdated());
 
   unsafefile_item->DangerousDownloadValidated();
   ASSERT_TRUE(unsafefile_observer.CheckUpdated());
 }
 
 TEST_F(DownloadItemTest, NotificationAfterOnPathDetermined) {
   DownloadItem* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockObserver observer(item);
@@ skipping 15 matching lines @@
 TEST_F(DownloadItemTest, NotificationAfterTogglePause) {
   DownloadItem* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockObserver observer(item);
 
   item->TogglePause();
   ASSERT_TRUE(observer.CheckUpdated());
 
   item->TogglePause();
   ASSERT_TRUE(observer.CheckUpdated());
 }