OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" |
8 #include "components/dom_distiller/core/distiller_url_fetcher.h" | 9 #include "components/dom_distiller/core/distiller_url_fetcher.h" |
9 #include "net/http/http_status_code.h" | 10 #include "net/http/http_status_code.h" |
10 #include "net/url_request/test_url_fetcher_factory.h" | 11 #include "net/url_request/test_url_fetcher_factory.h" |
11 #include "net/url_request/url_fetcher.h" | 12 #include "net/url_request/url_fetcher.h" |
12 #include "net/url_request/url_request_context_getter.h" | 13 #include "net/url_request/url_request_context_getter.h" |
13 #include "net/url_request/url_request_status.h" | 14 #include "net/url_request/url_request_status.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
16 | 17 |
17 const char kTestPageA[] = "http://www.a.com/"; | 18 const char kTestPageA[] = "http://www.a.com/"; |
(...skipping 25 matching lines...) Expand all Loading... |
43 net::URLRequestStatus::SUCCESS); | 44 net::URLRequestStatus::SUCCESS); |
44 } | 45 } |
45 | 46 |
46 void Fetch(const std::string& url, | 47 void Fetch(const std::string& url, |
47 const std::string& expected_response) { | 48 const std::string& expected_response) { |
48 base::MessageLoopForUI loop; | 49 base::MessageLoopForUI loop; |
49 url_fetcher_->FetchURL( | 50 url_fetcher_->FetchURL( |
50 url, | 51 url, |
51 base::Bind(&DistillerURLFetcherTest::FetcherCallback, | 52 base::Bind(&DistillerURLFetcherTest::FetcherCallback, |
52 base::Unretained(this))); | 53 base::Unretained(this))); |
53 loop.RunUntilIdle(); | 54 base::RunLoop().RunUntilIdle(); |
54 CHECK_EQ(expected_response, response_); | 55 CHECK_EQ(expected_response, response_); |
55 } | 56 } |
56 | 57 |
57 std::unique_ptr<dom_distiller::DistillerURLFetcher> url_fetcher_; | 58 std::unique_ptr<dom_distiller::DistillerURLFetcher> url_fetcher_; |
58 std::unique_ptr<net::FakeURLFetcherFactory> factory_; | 59 std::unique_ptr<net::FakeURLFetcherFactory> factory_; |
59 std::string response_; | 60 std::string response_; |
60 }; | 61 }; |
61 | 62 |
62 TEST_F(DistillerURLFetcherTest, PopulateProto) { | 63 TEST_F(DistillerURLFetcherTest, PopulateProto) { |
63 Fetch(kTestPageA, | 64 Fetch(kTestPageA, |
64 std::string(kTestPageAResponse, sizeof(kTestPageAResponse))); | 65 std::string(kTestPageAResponse, sizeof(kTestPageAResponse))); |
65 } | 66 } |
66 | 67 |
67 TEST_F(DistillerURLFetcherTest, PopulateProtoFailedFetch) { | 68 TEST_F(DistillerURLFetcherTest, PopulateProtoFailedFetch) { |
68 // Expect the callback to contain an empty string for this URL. | 69 // Expect the callback to contain an empty string for this URL. |
69 Fetch(kTestPageB, std::string(std::string(), 0)); | 70 Fetch(kTestPageB, std::string(std::string(), 0)); |
70 } | 71 } |
OLD | NEW |