Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1062)

Side by Side Diff: mojo/edk/embedder/test_embedder.cc

Issue 898623002: Make mojo::system::Core not own the PlatformSupport. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: foo Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/edk/embedder/embedder_internal.h ('k') | mojo/edk/system/channel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/edk/embedder/test_embedder.h" 5 #include "mojo/edk/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/edk/embedder/embedder.h" 10 #include "mojo/edk/embedder/embedder.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 bool Shutdown() { 48 bool Shutdown() {
49 CHECK(internal::g_channel_manager); 49 CHECK(internal::g_channel_manager);
50 delete internal::g_channel_manager; 50 delete internal::g_channel_manager;
51 internal::g_channel_manager = nullptr; 51 internal::g_channel_manager = nullptr;
52 52
53 CHECK(internal::g_core); 53 CHECK(internal::g_core);
54 bool rv = system::internal::ShutdownCheckNoLeaks(internal::g_core); 54 bool rv = system::internal::ShutdownCheckNoLeaks(internal::g_core);
55 delete internal::g_core; 55 delete internal::g_core;
56 internal::g_core = nullptr; 56 internal::g_core = nullptr;
57
58 CHECK(internal::g_platform_support);
59 delete internal::g_platform_support;
60 internal::g_platform_support = nullptr;
61
57 return rv; 62 return rv;
58 } 63 }
59 64
60 } // namespace test 65 } // namespace test
61 } // namespace embedder 66 } // namespace embedder
62 67
63 } // namespace mojo 68 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/embedder/embedder_internal.h ('k') | mojo/edk/system/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698