summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 01:23:06 +0000
committertzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 01:23:06 +0000
commit5591cd69ac35dc5e182738d3c607eb84197884f8 (patch)
tree8e0ce6c4c72eca93e0ec2bcbe8d827aa381e1c83 /webkit
parent9f9ce886e0f50622e3c3e14d7f90f2cbed96e4e9 (diff)
downloadchromium_src-5591cd69ac35dc5e182738d3c607eb84197884f8.zip
chromium_src-5591cd69ac35dc5e182738d3c607eb84197884f8.tar.gz
chromium_src-5591cd69ac35dc5e182738d3c607eb84197884f8.tar.bz2
Temporary allow IO for GetMimeTypeFromExtensions in MediaPathFilter.
BUG=140401 Review URL: https://chromiumcodereview.appspot.com/10824160 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/fileapi/media/media_path_filter.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/fileapi/media/media_path_filter.cc b/webkit/fileapi/media/media_path_filter.cc
index 1239f83..3dd9201 100644
--- a/webkit/fileapi/media/media_path_filter.cc
+++ b/webkit/fileapi/media/media_path_filter.cc
@@ -8,6 +8,7 @@
#include <string>
#include "base/string_util.h"
+#include "base/threading/thread_restrictions.h"
#include "net/base/mime_util.h"
namespace fileapi {
@@ -23,6 +24,10 @@ bool IsUnsupportedExtension(const FilePath::StringType& extension) {
} // namespace
MediaPathFilter::MediaPathFilter() {
+ // TODO(tzik): http://crbug.com/140401
+ // Remove this ScopedAllowIO after move this to FILE thread.
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+
net::GetImageExtensions(&media_file_extensions_);
net::GetAudioExtensions(&media_file_extensions_);
net::GetVideoExtensions(&media_file_extensions_);