| Index: net/url_request/url_request_test_job.cc
|
| diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
|
| index 422e08030d72d9f0e995480fc62e0b1628e9fe5b..e6ed019a36b4b13ffc784f61c36b928831177105 100644
|
| --- a/net/url_request/url_request_test_job.cc
|
| +++ b/net/url_request/url_request_test_job.cc
|
| @@ -21,14 +21,15 @@ namespace net {
|
| namespace {
|
|
|
| typedef std::list<URLRequestTestJob*> URLRequestJobList;
|
| -base::LazyInstance<URLRequestJobList>::Leaky
|
| - g_pending_jobs = LAZY_INSTANCE_INITIALIZER;
|
| +base::LazyInstance<URLRequestJobList>::Leaky g_pending_jobs =
|
| + LAZY_INSTANCE_INITIALIZER;
|
|
|
| class TestJobProtocolHandler : public URLRequestJobFactory::ProtocolHandler {
|
| public:
|
| // URLRequestJobFactory::ProtocolHandler implementation:
|
| virtual URLRequestJob* MaybeCreateJob(
|
| - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE {
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate) const OVERRIDE {
|
| return new URLRequestTestJob(request, network_delegate);
|
| }
|
| };
|
| @@ -176,8 +177,8 @@ void URLRequestTestJob::Start() {
|
| // Start reading asynchronously so that all error reporting and data
|
| // callbacks happen as they would for network requests.
|
| base::MessageLoop::current()->PostTask(
|
| - FROM_HERE, base::Bind(&URLRequestTestJob::StartAsync,
|
| - weak_factory_.GetWeakPtr()));
|
| + FROM_HERE,
|
| + base::Bind(&URLRequestTestJob::StartAsync, weak_factory_.GetWeakPtr()));
|
| }
|
|
|
| void URLRequestTestJob::StartAsync() {
|
| @@ -201,8 +202,7 @@ void URLRequestTestJob::StartAsync() {
|
| // unexpected url, return error
|
| // FIXME(brettw) we may want to use WININET errors or have some more types
|
| // of errors
|
| - NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
|
| - ERR_INVALID_URL));
|
| + NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, ERR_INVALID_URL));
|
| // FIXME(brettw): this should emulate a network error, and not just fail
|
| // initiating a connection
|
| return;
|
| @@ -214,8 +214,9 @@ void URLRequestTestJob::StartAsync() {
|
| this->NotifyHeadersComplete();
|
| }
|
|
|
| -bool URLRequestTestJob::ReadRawData(IOBuffer* buf, int buf_size,
|
| - int *bytes_read) {
|
| +bool URLRequestTestJob::ReadRawData(IOBuffer* buf,
|
| + int buf_size,
|
| + int* bytes_read) {
|
| if (stage_ == WAITING) {
|
| async_buf_ = buf;
|
| async_buf_size_ = buf_size;
|
| @@ -330,8 +331,9 @@ bool URLRequestTestJob::NextReadAsync() {
|
| void URLRequestTestJob::AdvanceJob() {
|
| if (auto_advance_) {
|
| base::MessageLoop::current()->PostTask(
|
| - FROM_HERE, base::Bind(&URLRequestTestJob::ProcessNextOperation,
|
| - weak_factory_.GetWeakPtr()));
|
| + FROM_HERE,
|
| + base::Bind(&URLRequestTestJob::ProcessNextOperation,
|
| + weak_factory_.GetWeakPtr()));
|
| return;
|
| }
|
| g_pending_jobs.Get().push_back(this);
|
|
|