OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/test/test_navigation_url_loader_factory.h" | 5 #include "content/test/test_navigation_url_loader_factory.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "content/browser/loader/navigation_url_loader.h" | 9 #include "content/browser/loader/navigation_url_loader.h" |
10 #include "content/test/test_navigation_url_loader.h" | 10 #include "content/test/test_navigation_url_loader.h" |
11 | 11 |
12 namespace content { | 12 namespace content { |
13 | 13 |
14 TestNavigationURLLoaderFactory::TestNavigationURLLoaderFactory() { | 14 TestNavigationURLLoaderFactory::TestNavigationURLLoaderFactory() { |
15 NavigationURLLoader::SetFactoryForTesting(this); | 15 NavigationURLLoader::SetFactoryForTesting(this); |
16 } | 16 } |
17 | 17 |
18 TestNavigationURLLoaderFactory::~TestNavigationURLLoaderFactory() { | 18 TestNavigationURLLoaderFactory::~TestNavigationURLLoaderFactory() { |
19 NavigationURLLoader::SetFactoryForTesting(NULL); | 19 NavigationURLLoader::SetFactoryForTesting(NULL); |
20 } | 20 } |
21 | 21 |
22 scoped_ptr<NavigationURLLoader> TestNavigationURLLoaderFactory::CreateLoader( | 22 std::unique_ptr<NavigationURLLoader> |
| 23 TestNavigationURLLoaderFactory::CreateLoader( |
23 BrowserContext* browser_context, | 24 BrowserContext* browser_context, |
24 scoped_ptr<NavigationRequestInfo> request_info, | 25 std::unique_ptr<NavigationRequestInfo> request_info, |
25 ServiceWorkerNavigationHandle* service_worker_handle, | 26 ServiceWorkerNavigationHandle* service_worker_handle, |
26 NavigationURLLoaderDelegate* delegate) { | 27 NavigationURLLoaderDelegate* delegate) { |
27 return scoped_ptr<NavigationURLLoader>( | 28 return std::unique_ptr<NavigationURLLoader>( |
28 new TestNavigationURLLoader(std::move(request_info), delegate)); | 29 new TestNavigationURLLoader(std::move(request_info), delegate)); |
29 } | 30 } |
30 | 31 |
31 } // namespace content | 32 } // namespace content |
OLD | NEW |