chrome/browser/net/url_request_mock_http_job.cc - Issue 3983005: Revert 63600 - Thread IO safety: annotate file_util, and block IO thread from...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/net/url_request_mock_http_job.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_http_job.cc

===================================================================

--- chrome/browser/net/url_request_mock_http_job.cc (revision 63629)

+++ chrome/browser/net/url_request_mock_http_job.cc (working copy)

@@ -7,7 +7,6 @@

#include "base/file_util.h"

#include "base/message_loop.h"

#include "base/string_util.h"

-#include "base/thread_restrictions.h"

#include "base/utf_string_conversions.h"

#include "chrome/common/url_constants.h"

#include "net/base/net_util.h"

@@ -88,10 +87,6 @@

// Private const version.

void URLRequestMockHTTPJob::GetResponseInfoConst(

net::HttpResponseInfo* info) const {

- // We have to load our headers from disk, but we only use this class

- // from tests, so allow these IO operations to happen on any thread.

- base::ThreadRestrictions::ScopedAllowIO allow_io;

FilePath header_file = FilePath(file_path_.value() + kMockHeaderFileSuffix);

std::string raw_headers;

if (!file_util::ReadFileToString(header_file, &raw_headers))

« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/net/url_request_mock_util.cc » ('j') | no next file with comments »