Removes the old download feedback string from the context menu

chrome/browser/download/download_shelf_context_menu.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.
 
 #include "chrome/browser/download/download_shelf_context_menu.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
-#include "chrome/browser/safe_browsing/download_feedback_service.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 64 matching lines @@
       // filename. Don't base an "Always open" decision based on it. Also
       // exclude extensions.
       return download_item_->CanOpenDownload() &&
           !download_crx_util::IsExtensionDownload(*download_item_);
     case CANCEL:
       return !download_item_->IsDone();
     case TOGGLE_PAUSE:
       return !download_item_->IsDone();
     case DISCARD:
     case KEEP:
-    case REPORT:
     case LEARN_MORE_SCANNING:
     case LEARN_MORE_INTERRUPTED:
       return true;
   }
   return false;
 }
 
 bool DownloadShelfContextMenu::IsCommandIdChecked(int command_id) const {
   if (!download_item_)
     return false;
@@ skipping 44 matching lines @@
       } else {
         download_item_->Resume();
       }
       break;
     case DISCARD:
       download_item_->Remove();
       break;
     case KEEP:
       download_item_->ValidateDangerousDownload();
       break;
-    case REPORT: {
-#if defined(FULL_SAFE_BROWSING)
-      using safe_browsing::DownloadProtectionService;
-      DownloadItemModel download_model(download_item_);
-      if (!download_model.ShouldAllowDownloadFeedback())
-        break;
-      SafeBrowsingService* sb_service =
-          g_browser_process->safe_browsing_service();
-      DownloadProtectionService* protection_service =
-          (sb_service ? sb_service->download_protection_service() : NULL);
-      if (protection_service) {
-        protection_service->feedback_service()->BeginFeedbackForDownload(
-            download_item_);
-      }
-#else
-      // Should only be getting invoked if we are using safe browsing.
-      NOTREACHED();
-#endif
-      break;
-    }
     case LEARN_MORE_SCANNING: {
 #if defined(FULL_SAFE_BROWSING)
       using safe_browsing::DownloadProtectionService;
       SafeBrowsingService* sb_service =
           g_browser_process->safe_browsing_service();
       DownloadProtectionService* protection_service =
           (sb_service ? sb_service->download_protection_service() : NULL);
       if (protection_service) {
         protection_service->ShowDetailsForDownload(*download_item_, navigator_);
       }
@@ skipping 39 matching lines @@
     case CANCEL:
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_CANCEL);
     case TOGGLE_PAUSE:
       if (download_item_ &&
           download_item_->GetState() == DownloadItem::IN_PROGRESS &&
           !download_item_->IsPaused())
         return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_PAUSE_ITEM);
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_RESUME_ITEM);
     case DISCARD:
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_DISCARD);
-    case REPORT:
-      return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_REPORT);
     case KEEP:
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_KEEP);
     case LEARN_MORE_SCANNING:
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING);
     case LEARN_MORE_INTERRUPTED:
       return l10n_util::GetStringUTF16(
           IDS_DOWNLOAD_MENU_LEARN_MORE_INTERRUPTED);
   }
   NOTREACHED();
   return base::string16();
@@ skipping 105 matching lines @@
 }
 
 ui::SimpleMenuModel*
 DownloadShelfContextMenu::GetMaliciousMenuModel() {
   if (malicious_download_menu_model_)
     return malicious_download_menu_model_.get();
 
   malicious_download_menu_model_.reset(new ui::SimpleMenuModel(this));
 
   DownloadItemModel download_model(download_item_);
-  if (download_model.ShouldAllowDownloadFeedback()) {
-    malicious_download_menu_model_->AddItemWithStringId(
-        REPORT, IDS_DOWNLOAD_MENU_REPORT);
-  }
   malicious_download_menu_model_->AddItemWithStringId(
       LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING);
 
   return malicious_download_menu_model_.get();
 }