diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 22:56:27 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 22:56:27 +0000 |
| commit | 8da3067b27f52b4413c0aad3ad5da721766e2129 (patch) | |
| tree | b87070e259c0137ea7715847319d54761d919cc1 /chrome/common | |
| parent | 88328f582694565b00ea445c4541f37fa73f3539 (diff) | |
| download | chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.zip chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.tar.gz chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.tar.bz2 | |
Revert "Thread IO safety: annotate file_util, and block IO thread from doing IO"
This reverts commit r63580, build breakage.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/extension_resource.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/common/extensions/extension_resource.cc b/chrome/common/extensions/extension_resource.cc index be22ec9..d3c5898 100644 --- a/chrome/common/extensions/extension_resource.cc +++ b/chrome/common/extensions/extension_resource.cc @@ -6,7 +6,6 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/thread_restrictions.h" PlatformThreadId ExtensionResource::file_thread_id_ = 0; @@ -46,12 +45,6 @@ const FilePath& ExtensionResource::GetFilePath() const { // static FilePath ExtensionResource::GetFilePathOnAnyThreadHack( const FilePath& extension_root, const FilePath& relative_path) { - // This function is a hack, and causes us to block the IO thread. - // Fixing - // http://code.google.com/p/chromium/issues/detail?id=59849 - // would also fix this. Suppress the error for now. - base::ThreadRestrictions::ScopedAllowIO allow_io; - // We need to resolve the parent references in the extension_root // path on its own because IsParent doesn't like parent references. FilePath clean_extension_root(extension_root); |