| Index: components/precache/core/fetcher_pool_unittest.cc
|
| diff --git a/components/precache/core/fetcher_pool_unittest.cc b/components/precache/core/fetcher_pool_unittest.cc
|
| index 19dfc4ba454f3b0cf46b523a54a07b20aa160cf4..a15388ed91ff010722be90a451c5aa01879b3bd0 100644
|
| --- a/components/precache/core/fetcher_pool_unittest.cc
|
| +++ b/components/precache/core/fetcher_pool_unittest.cc
|
| @@ -8,10 +8,10 @@
|
| #include <array>
|
| #include <functional>
|
| #include <list>
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "net/http/http_status_code.h"
|
| #include "net/url_request/test_url_fetcher_factory.h"
|
| @@ -48,7 +48,7 @@ TEST(FetcherPoolTest, AddDelete) {
|
| // It also tests IsAvailable.
|
| base::MessageLoop loop;
|
| MockURLFetcherDelegate delegate;
|
| - scoped_ptr<URLFetcher> url_fetcher(
|
| + std::unique_ptr<URLFetcher> url_fetcher(
|
| new FakeURLFetcher(GURL("http://a.com"), &delegate, "irrelevant", HTTP_OK,
|
| URLRequestStatus::SUCCESS));
|
| URLFetcher* url_fetcher_ptr = url_fetcher.get();
|
| @@ -73,7 +73,7 @@ TEST(FetcherPoolTest, Delete) {
|
| const size_t kSize = 42;
|
| base::MessageLoop loop;
|
| MockURLFetcherDelegate delegate;
|
| - scoped_ptr<URLFetcher> url_fetcher(
|
| + std::unique_ptr<URLFetcher> url_fetcher(
|
| new FakeURLFetcher(GURL("http://a.com"), &delegate, "irrelevant", HTTP_OK,
|
| URLRequestStatus::SUCCESS));
|
| URLFetcher* url_fetcher_ptr = url_fetcher.get();
|
| @@ -100,7 +100,7 @@ TEST(FetcherPoolTest, ParallelURLFetchers) {
|
| EXPECT_CALL(delegate, OnURLFetchComplete(_)).Times(0);
|
| int num_requests_in_flight = 0;
|
| for (const auto& url : urls) {
|
| - scoped_ptr<URLFetcher> url_fetcher(
|
| + std::unique_ptr<URLFetcher> url_fetcher(
|
| new FakeURLFetcher(GURL(url), &delegate, "irrelevant", HTTP_OK,
|
| URLRequestStatus::SUCCESS));
|
| num_requests_in_flight++;
|
| @@ -130,7 +130,7 @@ TEST(FetcherPoolTest, DeleteAll) {
|
| std::string urls[] = {"http://a.com", "http://b.com", "http://c.com"};
|
| EXPECT_CALL(delegate, OnURLFetchComplete(_)).Times(0);
|
| for (const auto& url : urls) {
|
| - scoped_ptr<URLFetcher> url_fetcher(
|
| + std::unique_ptr<URLFetcher> url_fetcher(
|
| new FakeURLFetcher(GURL(url), &delegate, "irrelevant", HTTP_OK,
|
| URLRequestStatus::SUCCESS));
|
| url_fetcher->Start();
|
| @@ -150,7 +150,7 @@ TEST(FetcherPoolTest, DeleteAll) {
|
| TEST(FetcherPoolTest, AddTooManyURLFetchers) {
|
| MockURLFetcherDelegate delegate;
|
| FetcherPool<URLFetcher> pool(0);
|
| - scoped_ptr<URLFetcher> url_fetcher(
|
| + std::unique_ptr<URLFetcher> url_fetcher(
|
| new FakeURLFetcher(GURL("http://queso.es"), &delegate, "irrelevant",
|
| HTTP_OK, URLRequestStatus::SUCCESS));
|
| EXPECT_DEBUG_DEATH(pool.Add(std::move(url_fetcher)),
|
| @@ -159,7 +159,7 @@ TEST(FetcherPoolTest, AddTooManyURLFetchers) {
|
|
|
| TEST(FetcherPoolTest, AddNullURLFetcher) {
|
| FetcherPool<URLFetcher> pool(1);
|
| - scoped_ptr<URLFetcher> null_ptr;
|
| + std::unique_ptr<URLFetcher> null_ptr;
|
| EXPECT_DEBUG_DEATH(pool.Add(std::move(null_ptr)), "cannot be null");
|
| }
|
|
|
| @@ -185,7 +185,7 @@ TEST(FetcherPoolTest, ExampleUsage) {
|
| std::function<void()> start_next_batch = [&pending_urls, &pool, &delegate]() {
|
| while (!pending_urls.empty() && pool.IsAvailable()) {
|
| // Called CreateAndStartUrlFetcher in the documentation.
|
| - scoped_ptr<URLFetcher> fetcher(
|
| + std::unique_ptr<URLFetcher> fetcher(
|
| new FakeURLFetcher(GURL(pending_urls.front()), &delegate,
|
| "irrelevant", HTTP_OK, URLRequestStatus::SUCCESS));
|
| fetcher->Start();
|
|
|