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

Unified Diff: chrome/browser/net/url_request_mock_util.cc

Issue 3983005: Revert 63600 - Thread IO safety: annotate file_util, and block IO thread from... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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: chrome/browser/net/url_request_mock_util.cc
===================================================================
--- chrome/browser/net/url_request_mock_util.cc (revision 63629)
+++ chrome/browser/net/url_request_mock_util.cc (working copy)
@@ -7,7 +7,6 @@
#include <string>
#include "base/path_service.h"
-#include "base/thread_restrictions.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/net/url_request_failed_dns_job.h"
#include "chrome/browser/net/url_request_mock_http_job.h"
@@ -25,11 +24,6 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (enabled) {
- // We have to look around for our helper files, but we only use
- // this from tests, so allow these IO operations to happen
- // anywhere.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
-
URLRequestFilter::GetInstance()->ClearHandlers();
URLRequestFailedDnsJob::AddUrlHandler();
« no previous file with comments | « chrome/browser/net/url_request_mock_http_job.cc ('k') | chrome/browser/printing/print_dialog_cloud_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698