| Index: net/url_request/test_url_fetcher_factory.h
|
| diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h
|
| index f2139d9bf0fe66d773e75ecba09de59995eabe3e..c2f698503bc72448f8fe2e76490b1b327a79ddad 100644
|
| --- a/net/url_request/test_url_fetcher_factory.h
|
| +++ b/net/url_request/test_url_fetcher_factory.h
|
| @@ -81,9 +81,7 @@ class TestURLFetcher : public URLFetcher {
|
| virtual void OnRequestEnd(int fetcher_id) = 0;
|
| };
|
|
|
| - TestURLFetcher(int id,
|
| - const GURL& url,
|
| - URLFetcherDelegate* d);
|
| + TestURLFetcher(int id, const GURL& url, URLFetcherDelegate* d);
|
| virtual ~TestURLFetcher();
|
|
|
| // URLFetcher implementation
|
| @@ -147,7 +145,8 @@ class TestURLFetcher : public URLFetcher {
|
| virtual bool GetResponseAsString(
|
| std::string* out_response_string) const OVERRIDE;
|
| virtual bool GetResponseAsFilePath(
|
| - bool take_ownership, base::FilePath* out_response_path) const OVERRIDE;
|
| + bool take_ownership,
|
| + base::FilePath* out_response_path) const OVERRIDE;
|
|
|
| void GetExtraRequestHeaders(HttpRequestHeaders* headers) const;
|
|
|
| @@ -191,7 +190,7 @@ class TestURLFetcher : public URLFetcher {
|
|
|
| private:
|
| enum ResponseDestinationType {
|
| - STRING, // Default: In a std::string
|
| + STRING, // Default: In a std::string
|
| TEMP_FILE // Write to a temp file
|
| };
|
|
|
| @@ -239,11 +238,10 @@ class TestURLFetcherFactory : public URLFetcherFactory,
|
| TestURLFetcherFactory();
|
| virtual ~TestURLFetcherFactory();
|
|
|
| - virtual URLFetcher* CreateURLFetcher(
|
| - int id,
|
| - const GURL& url,
|
| - URLFetcher::RequestType request_type,
|
| - URLFetcherDelegate* d) OVERRIDE;
|
| + virtual URLFetcher* CreateURLFetcher(int id,
|
| + const GURL& url,
|
| + URLFetcher::RequestType request_type,
|
| + URLFetcherDelegate* d) OVERRIDE;
|
| TestURLFetcher* GetFetcherByID(int id) const;
|
| void RemoveFetcherFromMap(int id);
|
| void SetDelegateForTests(TestURLFetcherDelegateForTests* delegate_for_tests);
|
| @@ -311,7 +309,6 @@ class FakeURLFetcher : public TestURLFetcher {
|
| DISALLOW_COPY_AND_ASSIGN(FakeURLFetcher);
|
| };
|
|
|
| -
|
| // FakeURLFetcherFactory is a factory for FakeURLFetcher objects. When
|
| // instantiated, it sets itself up as the default URLFetcherFactory. Fake
|
| // responses for given URLs can be set using SetFakeResponse.
|
| @@ -369,12 +366,12 @@ class FakeURLFetcherFactory : public URLFetcherFactory,
|
| // These arguments should by default be used in instantiating FakeURLFetcher
|
| // like so:
|
| // new FakeURLFetcher(url, delegate, response_data, response_code, status)
|
| - typedef base::Callback<scoped_ptr<FakeURLFetcher>(
|
| - const GURL&,
|
| - URLFetcherDelegate*,
|
| - const std::string&,
|
| - HttpStatusCode,
|
| - URLRequestStatus::Status)> FakeURLFetcherCreator;
|
| + typedef base::Callback<scoped_ptr<FakeURLFetcher>(const GURL&,
|
| + URLFetcherDelegate*,
|
| + const std::string&,
|
| + HttpStatusCode,
|
| + URLRequestStatus::Status)>
|
| + FakeURLFetcherCreator;
|
|
|
| // |default_factory|, which can be NULL, is a URLFetcherFactory that
|
| // will be used to construct a URLFetcher in case the URL being created
|
| @@ -399,11 +396,10 @@ class FakeURLFetcherFactory : public URLFetcherFactory,
|
| // NULL.
|
| // Otherwise, it will return a URLFetcher object which will respond with the
|
| // pre-baked response that the client has set by calling SetFakeResponse().
|
| - virtual URLFetcher* CreateURLFetcher(
|
| - int id,
|
| - const GURL& url,
|
| - URLFetcher::RequestType request_type,
|
| - URLFetcherDelegate* d) OVERRIDE;
|
| + virtual URLFetcher* CreateURLFetcher(int id,
|
| + const GURL& url,
|
| + URLFetcher::RequestType request_type,
|
| + URLFetcherDelegate* d) OVERRIDE;
|
|
|
| // Sets the fake response for a given URL. The |response_data| may be empty.
|
| // The |response_code| may be any HttpStatusCode. For instance, HTTP_OK will
|
| @@ -452,12 +448,10 @@ class URLFetcherImplFactory : public URLFetcherFactory {
|
| virtual ~URLFetcherImplFactory();
|
|
|
| // This method will create a real URLFetcher.
|
| - virtual URLFetcher* CreateURLFetcher(
|
| - int id,
|
| - const GURL& url,
|
| - URLFetcher::RequestType request_type,
|
| - URLFetcherDelegate* d) OVERRIDE;
|
| -
|
| + virtual URLFetcher* CreateURLFetcher(int id,
|
| + const GURL& url,
|
| + URLFetcher::RequestType request_type,
|
| + URLFetcherDelegate* d) OVERRIDE;
|
| };
|
|
|
| } // namespace net
|
|
|