summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/autoupdate_interceptor.cc
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-23 04:09:46 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-23 04:09:46 +0000
commitbd25f1d16e9f9c8f94a6e761719d7239028447c8 (patch)
tree94c4ea7e47626540cf863b359dd9d8e58348dd30 /chrome/browser/extensions/autoupdate_interceptor.cc
parenta64a12806c27b34f686cf66700da56b812a9c199 (diff)
downloadchromium_src-bd25f1d16e9f9c8f94a6e761719d7239028447c8.zip
chromium_src-bd25f1d16e9f9c8f94a6e761719d7239028447c8.tar.gz
chromium_src-bd25f1d16e9f9c8f94a6e761719d7239028447c8.tar.bz2
Revert 63600 - Thread IO safety: annotate file_util, and block IO thread from doing IO
Reverting because this breaks the ChromiumOS (dbg) builder. - Mark functions in file_util_posix as requiring permission to perform disk actions. - Mark the IO thread as disallowed from performing disk actions. - Temporarily work around the protections in places where we currently have bugs. BUG=59847,59849,60207,60211 TEST=no dchecks in debug builds Review URL: http://codereview.chromium.org/3872002 TBR=evan@chromium.org Review URL: http://codereview.chromium.org/3983005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/autoupdate_interceptor.cc')
-rw-r--r--chrome/browser/extensions/autoupdate_interceptor.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc
index ef0091f..2acd0a0 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.cc
+++ b/chrome/browser/extensions/autoupdate_interceptor.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/autoupdate_interceptor.h"
#include "base/file_util.h"
-#include "base/thread_restrictions.h"
#include "chrome/browser/browser_thread.h"
#include "net/url_request/url_request_test_job.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -41,10 +40,6 @@ URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(URLRequest* request) {
return NULL;
}
- // It's ok to do a blocking disk access on this thread; this class
- // is just used for tests.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
-
// Search for this request's url, ignoring any query parameters.
GURL url = request->url();
if (url.has_query()) {
@@ -66,9 +61,6 @@ URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(URLRequest* request) {
void AutoUpdateInterceptor::SetResponse(const std::string url,
const FilePath& path) {
EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
- // It's ok to do a blocking disk access on this thread; this class
- // is just used for tests.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
GURL gurl(url);
EXPECT_EQ("http", gurl.scheme());
EXPECT_EQ("localhost", gurl.host());