OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/shell/utility/shell_content_utility_client.h" | 5 #include "content/shell/utility/shell_content_utility_client.h" |
6 | 6 |
| 7 #include <memory> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
8 #include "base/memory/scoped_ptr.h" | |
9 #include "content/common/mojo/static_loader.h" | 10 #include "content/common/mojo/static_loader.h" |
10 #include "content/public/test/test_mojo_app.h" | 11 #include "content/public/test/test_mojo_app.h" |
11 | 12 |
12 namespace content { | 13 namespace content { |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 scoped_ptr<mojo::ShellClient> CreateTestApp() { | 17 std::unique_ptr<mojo::ShellClient> CreateTestApp() { |
17 return scoped_ptr<mojo::ShellClient>(new TestMojoApp); | 18 return std::unique_ptr<mojo::ShellClient>(new TestMojoApp); |
18 } | 19 } |
19 | 20 |
20 } // namespace | 21 } // namespace |
21 | 22 |
22 ShellContentUtilityClient::~ShellContentUtilityClient() { | 23 ShellContentUtilityClient::~ShellContentUtilityClient() { |
23 } | 24 } |
24 | 25 |
25 void ShellContentUtilityClient::RegisterMojoApplications( | 26 void ShellContentUtilityClient::RegisterMojoApplications( |
26 StaticMojoApplicationMap* apps) { | 27 StaticMojoApplicationMap* apps) { |
27 apps->insert(std::make_pair(kTestMojoAppUrl, base::Bind(&CreateTestApp))); | 28 apps->insert(std::make_pair(kTestMojoAppUrl, base::Bind(&CreateTestApp))); |
28 } | 29 } |
29 | 30 |
30 } // namespace content | 31 } // namespace content |
OLD | NEW |