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

Unified Diff: content/child/web_url_loader_impl.cc

Issue 401523002: Move media related mimetype functionality out of net/ and into media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add content/common/mime_util.h for realz Created 6 years, 5 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/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 45b0d6d3f12841ab28b6ae9ee3a32f3d53cea2e2..126eaca789543a66a9b133ee7702f8ae6861700c 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -19,12 +19,12 @@
#include "content/child/resource_dispatcher.h"
#include "content/child/sync_load_response.h"
#include "content/child/weburlresponse_extradata_impl.h"
+#include "content/common/mime_util.h"
#include "content/common/resource_request_body.h"
#include "content/public/child/request_peer.h"
#include "net/base/data_url.h"
#include "net/base/filename_util.h"
#include "net/base/load_flags.h"
-#include "net/base/mime_util.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
@@ -686,8 +686,9 @@ bool WebURLLoaderImpl::Context::CanHandleDataURL(const GURL& url) const {
std::string mime_type, unused_charset;
if (net::DataURL::Parse(url, &mime_type, &unused_charset, NULL) &&
- net::IsSupportedMimeType(mime_type))
+ content::IsSupportedMimeType(mime_type)) {
return true;
+ }
return false;
}

Powered by Google App Engine
This is Rietveld 408576698