| Index: net/url_request/test_url_fetcher_factory.cc
|
| diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
|
| index d6c66118f32fe8a5e65ae5d6ff4ff8f8bc1d5298..12d7ad5314fb3428e1ec859af085664200ea2762 100644
|
| --- a/net/url_request/test_url_fetcher_factory.cc
|
| +++ b/net/url_request/test_url_fetcher_factory.cc
|
| @@ -21,8 +21,7 @@
|
|
|
| namespace net {
|
|
|
| -ScopedURLFetcherFactory::ScopedURLFetcherFactory(
|
| - URLFetcherFactory* factory) {
|
| +ScopedURLFetcherFactory::ScopedURLFetcherFactory(URLFetcherFactory* factory) {
|
| DCHECK(!URLFetcherImpl::factory());
|
| URLFetcherImpl::set_factory(factory);
|
| }
|
| @@ -32,9 +31,7 @@ ScopedURLFetcherFactory::~ScopedURLFetcherFactory() {
|
| URLFetcherImpl::set_factory(NULL);
|
| }
|
|
|
| -TestURLFetcher::TestURLFetcher(int id,
|
| - const GURL& url,
|
| - URLFetcherDelegate* d)
|
| +TestURLFetcher::TestURLFetcher(int id, const GURL& url, URLFetcherDelegate* d)
|
| : owner_(NULL),
|
| id_(id),
|
| original_url_(url),
|
| @@ -82,7 +79,7 @@ void TestURLFetcher::AppendChunkToUpload(const std::string& data,
|
| }
|
|
|
| void TestURLFetcher::SetLoadFlags(int load_flags) {
|
| - fake_load_flags_= load_flags;
|
| + fake_load_flags_ = load_flags;
|
| }
|
|
|
| int TestURLFetcher::GetLoadFlags() const {
|
| @@ -158,9 +155,8 @@ void TestURLFetcher::SaveResponseWithWriter(
|
| DCHECK_EQ(OK, response);
|
|
|
| scoped_refptr<IOBuffer> buffer(new StringIOBuffer(fake_response_string_));
|
| - response = response_writer_->Write(buffer.get(),
|
| - fake_response_string_.size(),
|
| - CompletionCallback());
|
| + response = response_writer_->Write(
|
| + buffer.get(), fake_response_string_.size(), CompletionCallback());
|
| DCHECK_EQ(static_cast<int>(fake_response_string_.size()), response);
|
| response = response_writer_->Finish(CompletionCallback());
|
| DCHECK_EQ(OK, response);
|
| @@ -221,7 +217,8 @@ bool TestURLFetcher::GetResponseAsString(
|
| }
|
|
|
| bool TestURLFetcher::GetResponseAsFilePath(
|
| - bool take_ownership, base::FilePath* out_response_path) const {
|
| + bool take_ownership,
|
| + base::FilePath* out_response_path) const {
|
| if (fake_response_destination_ != TEMP_FILE)
|
| return false;
|
|
|
| @@ -229,8 +226,7 @@ bool TestURLFetcher::GetResponseAsFilePath(
|
| return true;
|
| }
|
|
|
| -void TestURLFetcher::GetExtraRequestHeaders(
|
| - HttpRequestHeaders* headers) const {
|
| +void TestURLFetcher::GetExtraRequestHeaders(HttpRequestHeaders* headers) const {
|
| *headers = fake_extra_request_headers_;
|
| }
|
|
|
| @@ -271,7 +267,8 @@ TestURLFetcherFactory::TestURLFetcherFactory()
|
| remove_fetcher_on_delete_(false) {
|
| }
|
|
|
| -TestURLFetcherFactory::~TestURLFetcherFactory() {}
|
| +TestURLFetcherFactory::~TestURLFetcherFactory() {
|
| +}
|
|
|
| URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
|
| int id,
|
| @@ -307,10 +304,9 @@ FakeURLFetcher::FakeURLFetcher(const GURL& url,
|
| const std::string& response_data,
|
| HttpStatusCode response_code,
|
| URLRequestStatus::Status status)
|
| - : TestURLFetcher(0, url, d),
|
| - weak_factory_(this) {
|
| + : TestURLFetcher(0, url, d), weak_factory_(this) {
|
| Error error = OK;
|
| - switch(status) {
|
| + switch (status) {
|
| case URLRequestStatus::SUCCESS:
|
| // |error| is initialized to OK.
|
| break;
|
| @@ -329,7 +325,8 @@ FakeURLFetcher::FakeURLFetcher(const GURL& url,
|
| SetResponseString(response_data);
|
| }
|
|
|
| -FakeURLFetcher::~FakeURLFetcher() {}
|
| +FakeURLFetcher::~FakeURLFetcher() {
|
| +}
|
|
|
| void FakeURLFetcher::Start() {
|
| base::MessageLoop::current()->PostTask(
|
| @@ -345,8 +342,7 @@ const GURL& FakeURLFetcher::GetURL() const {
|
| return TestURLFetcher::GetOriginalURL();
|
| }
|
|
|
| -FakeURLFetcherFactory::FakeURLFetcherFactory(
|
| - URLFetcherFactory* default_factory)
|
| +FakeURLFetcherFactory::FakeURLFetcherFactory(URLFetcherFactory* default_factory)
|
| : ScopedURLFetcherFactory(this),
|
| creator_(base::Bind(&DefaultFakeURLFetcherCreator)),
|
| default_factory_(default_factory) {
|
| @@ -361,16 +357,17 @@ FakeURLFetcherFactory::FakeURLFetcherFactory(
|
| }
|
|
|
| scoped_ptr<FakeURLFetcher> FakeURLFetcherFactory::DefaultFakeURLFetcherCreator(
|
| - const GURL& url,
|
| - URLFetcherDelegate* delegate,
|
| - const std::string& response_data,
|
| - HttpStatusCode response_code,
|
| - URLRequestStatus::Status status) {
|
| + const GURL& url,
|
| + URLFetcherDelegate* delegate,
|
| + const std::string& response_data,
|
| + HttpStatusCode response_code,
|
| + URLRequestStatus::Status status) {
|
| return scoped_ptr<FakeURLFetcher>(
|
| new FakeURLFetcher(url, delegate, response_data, response_code, status));
|
| }
|
|
|
| -FakeURLFetcherFactory::~FakeURLFetcherFactory() {}
|
| +FakeURLFetcherFactory::~FakeURLFetcherFactory() {
|
| +}
|
|
|
| URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
|
| int id,
|
| @@ -389,17 +386,19 @@ URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
|
| }
|
|
|
| scoped_ptr<FakeURLFetcher> fake_fetcher =
|
| - creator_.Run(url, d, it->second.response_data,
|
| - it->second.response_code, it->second.status);
|
| + creator_.Run(url,
|
| + d,
|
| + it->second.response_data,
|
| + it->second.response_code,
|
| + it->second.status);
|
| // TODO: Make URLFetcherFactory::CreateURLFetcher return a scoped_ptr
|
| return fake_fetcher.release();
|
| }
|
|
|
| -void FakeURLFetcherFactory::SetFakeResponse(
|
| - const GURL& url,
|
| - const std::string& response_data,
|
| - HttpStatusCode response_code,
|
| - URLRequestStatus::Status status) {
|
| +void FakeURLFetcherFactory::SetFakeResponse(const GURL& url,
|
| + const std::string& response_data,
|
| + HttpStatusCode response_code,
|
| + URLRequestStatus::Status status) {
|
| // Overwrite existing URL if it already exists.
|
| FakeURLResponse response;
|
| response.response_data = response_data;
|
| @@ -412,9 +411,11 @@ void FakeURLFetcherFactory::ClearFakeResponses() {
|
| fake_responses_.clear();
|
| }
|
|
|
| -URLFetcherImplFactory::URLFetcherImplFactory() {}
|
| +URLFetcherImplFactory::URLFetcherImplFactory() {
|
| +}
|
|
|
| -URLFetcherImplFactory::~URLFetcherImplFactory() {}
|
| +URLFetcherImplFactory::~URLFetcherImplFactory() {
|
| +}
|
|
|
| URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
|
| int id,
|
|
|