Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Unified Diff: content/browser/loader/buffered_resource_handler.cc

Issue 1110833003: Move the IsSupported* mime functions out of //net and into //components/mime_util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/buffered_resource_handler.cc
diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc
index a38eaa915ea449de9272b85d1356ff658b9f41ec..2d4e088318de723eb0ce2930a6ae3499fadd4654 100644
--- a/content/browser/loader/buffered_resource_handler.cc
+++ b/content/browser/loader/buffered_resource_handler.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
+#include "components/mime_util/mime_util.h"
#include "content/browser/download/download_resource_handler.h"
#include "content/browser/download/download_stats.h"
#include "content/browser/loader/certificate_resource_handler.h"
@@ -296,7 +297,7 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
ResourceRequestInfoImpl* info = GetRequestInfo();
const std::string& mime_type = response_->head.mime_type;
- if (net::IsSupportedCertificateMimeType(mime_type)) {
+ if (mime_util::IsSupportedCertificateMimeType(mime_type)) {
// Install certificate file.
info->set_is_download(true);
scoped_ptr<ResourceHandler> handler(
@@ -311,7 +312,7 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
scoped_ptr<ResourceHandler> handler(
host_->MaybeInterceptAsStream(request(), response_.get(), &payload));
if (handler) {
- DCHECK(!net::IsSupportedMimeType(mime_type));
+ DCHECK(!mime_util::IsSupportedMimeType(mime_type));
return UseAlternateNextHandler(handler.Pass(), payload);
}
}
@@ -327,7 +328,7 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
bool must_download = MustDownload();
if (!must_download) {
- if (net::IsSupportedMimeType(mime_type))
+ if (mime_util::IsSupportedMimeType(mime_type))
return true;
std::string payload;

Powered by Google App Engine
This is Rietveld 408576698