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 "mojo/embedder/test_embedder.h" | 5 #include "mojo/embedder/test_embedder.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "mojo/embedder/embedder.h" | 10 #include "mojo/embedder/embedder.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 return false; | 35 return false; |
36 } | 36 } |
37 | 37 |
38 } // namespace internal | 38 } // namespace internal |
39 } // namespace system | 39 } // namespace system |
40 | 40 |
41 namespace embedder { | 41 namespace embedder { |
42 namespace test { | 42 namespace test { |
43 | 43 |
44 void InitWithSimplePlatformSupport() { | 44 void InitWithSimplePlatformSupport() { |
45 Init(scoped_ptr<PlatformSupport>(new SimplePlatformSupport())); | 45 Init(make_scoped_ptr(new SimplePlatformSupport())); |
46 } | 46 } |
47 | 47 |
48 bool Shutdown() { | 48 bool Shutdown() { |
49 system::Core* core = system::entrypoints::GetCore(); | 49 system::Core* core = system::entrypoints::GetCore(); |
50 CHECK(core); | 50 CHECK(core); |
51 system::entrypoints::SetCore(nullptr); | 51 system::entrypoints::SetCore(nullptr); |
52 | 52 |
53 bool rv = system::internal::ShutdownCheckNoLeaks(core); | 53 bool rv = system::internal::ShutdownCheckNoLeaks(core); |
54 delete core; | 54 delete core; |
55 return rv; | 55 return rv; |
56 } | 56 } |
57 | 57 |
58 } // namespace test | 58 } // namespace test |
59 } // namespace embedder | 59 } // namespace embedder |
60 | 60 |
61 } // namespace mojo | 61 } // namespace mojo |
OLD | NEW |