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

Unified Diff: content/child/blink_platform_impl.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: Rebased 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
« no previous file with comments | « content/child/DEPS ('k') | content/child/simple_webmimeregistry_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 0a3e6cb2cce7e48718ca2cd38d60666a5a5a51ef..f9185a169d876974ca3c2e808453350329ac02b6 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -27,6 +27,7 @@
#include "base/time/time.h"
#include "blink/public/resources/grit/blink_image_resources.h"
#include "blink/public/resources/grit/blink_resources.h"
+#include "components/mime_util/mime_util.h"
#include "components/scheduler/child/webthread_impl_for_worker_scheduler.h"
#include "content/app/resources/grit/content_resources.h"
#include "content/app/strings/grit/content_strings.h"
@@ -49,7 +50,6 @@
#include "content/child/worker_task_runner.h"
#include "content/public/common/content_client.h"
#include "net/base/data_url.h"
-#include "net/base/mime_util.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
#include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h"
@@ -484,8 +484,8 @@ WebData BlinkPlatformImpl::parseDataURL(const WebURL& url,
WebString& mimetype_out,
WebString& charset_out) {
std::string mime_type, char_set, data;
- if (net::DataURL::Parse(url, &mime_type, &char_set, &data)
- && net::IsSupportedMimeType(mime_type)) {
+ if (net::DataURL::Parse(url, &mime_type, &char_set, &data) &&
+ mime_util::IsSupportedMimeType(mime_type)) {
mimetype_out = WebString::fromUTF8(mime_type);
charset_out = WebString::fromUTF8(char_set);
return data;
« no previous file with comments | « content/child/DEPS ('k') | content/child/simple_webmimeregistry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698