Tweak comments and put in tests for ignoring safe browsing results.

content/browser/download/download_item_impl.cc

 // Copyright (c) 2012 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.
 
 // File method ordering: Methods in this file are in the same order as
 // in download_item_impl.h, with the following exception: The public
 // interface Start is placed in chronological order with the other
 // (private) routines that together define a DownloadItem's state
 // transitions as the download progresses.  See "Download progression
 // cascade" later in this file.
@@ skipping 573 matching lines @@
 }
 
 // TODO(asanka): Unify GetSafetyState() and IsDangerous().
 DownloadItem::SafetyState DownloadItemImpl::GetSafetyState() const {
   return safety_state_;
 }
 
 bool DownloadItemImpl::IsDangerous() const {
   // TODO(noelutz): At this point only the windows views UI supports
   // warnings based on dangerous content.
-#ifdef OS_WIN

[asanka, 2013/01/07 17:14:31]

Why this change? The UI code for non-views doesn't reliably handle a transition
from non-dangerous -> dangerous.

[Randy Smith (Not in Mondays), 2013/01/07 20:55:59]

I'd rather not have the set danger test be windows only, and this ifdef didn't
strike me as having any meaning in non-test code since there's no way that we
can see *_CONTENT errors on non windows.  But I think my test will work (in unit
test mode) if I just set the new type to be DANGEROUS_FILE, so I'll try doing
that and reverting this change.

   return (danger_type_ == DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
           danger_type_ == DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
           danger_type_ == DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT ||
           danger_type_ == DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT);
-#else
-  return (danger_type_ == DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
-          danger_type_ == DOWNLOAD_DANGER_TYPE_DANGEROUS_URL);
-#endif
 }
 
 DownloadDangerType DownloadItemImpl::GetDangerType() const {
   return danger_type_;
 }
 
 bool DownloadItemImpl::TimeRemaining(base::TimeDelta* remaining) const {
   if (total_bytes_ <= 0)
     return false;  // We never received the content_length for this download.
 
@@ skipping 799 matching lines @@
       return "CANCELLED";
     case INTERRUPTED_INTERNAL:
       return "INTERRUPTED";
     default:
       NOTREACHED() << "Unknown download state " << state;
       return "unknown";
   };
 }
 
 }  // namespace content