| Index: net/url_request/url_request_filter_unittest.cc
|
| diff --git a/net/url_request/url_request_filter_unittest.cc b/net/url_request/url_request_filter_unittest.cc
|
| index 2e024a285e6682c5000458c7f77684e94914655d..bc1fee44e010a892901309b227cdb26ca2730db3 100644
|
| --- a/net/url_request/url_request_filter_unittest.cc
|
| +++ b/net/url_request/url_request_filter_unittest.cc
|
| @@ -43,7 +43,8 @@ class TestProtocolHandler : public URLRequestJobFactory::ProtocolHandler {
|
| virtual ~TestProtocolHandler() {}
|
|
|
| virtual URLRequestJob* MaybeCreateJob(
|
| - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE {
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate) const OVERRIDE {
|
| job_c = new URLRequestTestJob(request, network_delegate);
|
| return job_c;
|
| }
|
| @@ -62,16 +63,15 @@ TEST(URLRequestFilter, BasicMatching) {
|
| url_2, DEFAULT_PRIORITY, &delegate, &request_context);
|
|
|
| // Check AddUrlHandler checks for invalid URLs.
|
| - EXPECT_FALSE(URLRequestFilter::GetInstance()->AddUrlHandler(GURL(),
|
| - &FactoryA));
|
| + EXPECT_FALSE(
|
| + URLRequestFilter::GetInstance()->AddUrlHandler(GURL(), &FactoryA));
|
|
|
| // Check URL matching.
|
| URLRequestFilter::GetInstance()->ClearHandlers();
|
| - EXPECT_TRUE(URLRequestFilter::GetInstance()->AddUrlHandler(url_1,
|
| - &FactoryA));
|
| + EXPECT_TRUE(URLRequestFilter::GetInstance()->AddUrlHandler(url_1, &FactoryA));
|
| {
|
| - scoped_refptr<URLRequestJob> found = URLRequestFilter::Factory(
|
| - &request_1, NULL, url_1.scheme());
|
| + scoped_refptr<URLRequestJob> found =
|
| + URLRequestFilter::Factory(&request_1, NULL, url_1.scheme());
|
| EXPECT_EQ(job_a, found);
|
| EXPECT_TRUE(job_a != NULL);
|
| job_a = NULL;
|
| @@ -79,25 +79,24 @@ TEST(URLRequestFilter, BasicMatching) {
|
| EXPECT_EQ(URLRequestFilter::GetInstance()->hit_count(), 1);
|
|
|
| // Check we don't match other URLs.
|
| - EXPECT_TRUE(URLRequestFilter::Factory(
|
| - &request_2, NULL, url_2.scheme()) == NULL);
|
| + EXPECT_TRUE(URLRequestFilter::Factory(&request_2, NULL, url_2.scheme()) ==
|
| + NULL);
|
| EXPECT_EQ(1, URLRequestFilter::GetInstance()->hit_count());
|
|
|
| // Check we can remove URL matching.
|
| URLRequestFilter::GetInstance()->RemoveUrlHandler(url_1);
|
| - EXPECT_TRUE(URLRequestFilter::Factory(
|
| - &request_1, NULL, url_1.scheme()) == NULL);
|
| + EXPECT_TRUE(URLRequestFilter::Factory(&request_1, NULL, url_1.scheme()) ==
|
| + NULL);
|
| EXPECT_EQ(1, URLRequestFilter::GetInstance()->hit_count());
|
|
|
| // Check hostname matching.
|
| URLRequestFilter::GetInstance()->ClearHandlers();
|
| EXPECT_EQ(0, URLRequestFilter::GetInstance()->hit_count());
|
| - URLRequestFilter::GetInstance()->AddHostnameHandler(url_1.scheme(),
|
| - url_1.host(),
|
| - &FactoryB);
|
| + URLRequestFilter::GetInstance()->AddHostnameHandler(
|
| + url_1.scheme(), url_1.host(), &FactoryB);
|
| {
|
| - scoped_refptr<URLRequestJob> found = URLRequestFilter::Factory(
|
| - &request_1, NULL, url_1.scheme());
|
| + scoped_refptr<URLRequestJob> found =
|
| + URLRequestFilter::Factory(&request_1, NULL, url_1.scheme());
|
| EXPECT_EQ(job_b, found);
|
| EXPECT_TRUE(job_b != NULL);
|
| job_b = NULL;
|
| @@ -105,27 +104,28 @@ TEST(URLRequestFilter, BasicMatching) {
|
| EXPECT_EQ(1, URLRequestFilter::GetInstance()->hit_count());
|
|
|
| // Check we don't match other hostnames.
|
| - EXPECT_TRUE(URLRequestFilter::Factory(
|
| - &request_2, NULL, url_2.scheme()) == NULL);
|
| + EXPECT_TRUE(URLRequestFilter::Factory(&request_2, NULL, url_2.scheme()) ==
|
| + NULL);
|
| EXPECT_EQ(1, URLRequestFilter::GetInstance()->hit_count());
|
|
|
| // Check we can remove hostname matching.
|
| URLRequestFilter::GetInstance()->RemoveHostnameHandler(url_1.scheme(),
|
| url_1.host());
|
| - EXPECT_TRUE(URLRequestFilter::Factory(
|
| - &request_1, NULL, url_1.scheme()) == NULL);
|
| + EXPECT_TRUE(URLRequestFilter::Factory(&request_1, NULL, url_1.scheme()) ==
|
| + NULL);
|
| EXPECT_EQ(1, URLRequestFilter::GetInstance()->hit_count());
|
|
|
| // Check ProtocolHandler hostname matching.
|
| URLRequestFilter::GetInstance()->ClearHandlers();
|
| EXPECT_EQ(0, URLRequestFilter::GetInstance()->hit_count());
|
| URLRequestFilter::GetInstance()->AddHostnameProtocolHandler(
|
| - url_1.scheme(), url_1.host(),
|
| + url_1.scheme(),
|
| + url_1.host(),
|
| scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
|
| new TestProtocolHandler()));
|
| {
|
| - scoped_refptr<URLRequestJob> found = URLRequestFilter::Factory(
|
| - &request_1, NULL, url_1.scheme());
|
| + scoped_refptr<URLRequestJob> found =
|
| + URLRequestFilter::Factory(&request_1, NULL, url_1.scheme());
|
| EXPECT_EQ(job_c, found);
|
| EXPECT_TRUE(job_c != NULL);
|
| job_c = NULL;
|
| @@ -140,8 +140,8 @@ TEST(URLRequestFilter, BasicMatching) {
|
| scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
|
| new TestProtocolHandler()));
|
| {
|
| - scoped_refptr<URLRequestJob> found = URLRequestFilter::Factory(
|
| - &request_2, NULL, url_2.scheme());
|
| + scoped_refptr<URLRequestJob> found =
|
| + URLRequestFilter::Factory(&request_2, NULL, url_2.scheme());
|
| EXPECT_EQ(job_c, found);
|
| EXPECT_TRUE(job_c != NULL);
|
| job_c = NULL;
|
|
|