Revert of Refactor download image-MIME-type-detection code.

chrome/browser/download/download_item_model.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_item_model.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/supports_user_data.h"
 #include "base/time/time.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/download_feedback_service.h"
 #include "chrome/common/safe_browsing/download_file_types.pb.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/mime_util/mime_util.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
-#include "net/base/mime_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/text_elider.h"
 
 using base::TimeDelta;
 using content::DownloadItem;
 using safe_browsing::DownloadFileType;
 
 namespace {
@@ skipping 467 matching lines @@
       // We shouldn't get any of these due to the MightBeMalicious() test above.
       NOTREACHED();
       // Fallthrough.
     case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
-bool DownloadItemModel::HasSupportedImageMimeType() const {
-  if (mime_util::IsSupportedImageMimeType(download_->GetMimeType())) {
-    return true;
-  }
-
-  std::string mime;
-  base::FilePath::StringType extension_with_dot =
-      download_->GetTargetFilePath().FinalExtension();
-  if (!extension_with_dot.empty() && net::GetWellKnownMimeTypeFromExtension(
-                                         extension_with_dot.substr(1), &mime) &&
-      mime_util::IsSupportedImageMimeType(mime)) {
-    return true;
-  }
-
-  return false;
-}
-
 bool DownloadItemModel::ShouldAllowDownloadFeedback() const {
 #if defined(FULL_SAFE_BROWSING)
   if (!IsDangerous())
     return false;
   return safe_browsing::DownloadFeedbackService::IsEnabledForDownload(
       *download_);
 #else
   return false;
 #endif
 }
@@ skipping 197 matching lines @@
   if (!download_service)
     return;
 
   ChromeDownloadManagerDelegate* delegate =
       download_service->GetDownloadManagerDelegate();
   if (!delegate)
     return;
   delegate->OpenDownloadUsingPlatformHandler(download_);
   RecordDownloadOpenMethod(DOWNLOAD_OPEN_METHOD_USER_PLATFORM);
 }