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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/test_embedder.cc

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() 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 side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
diff --git a/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc b/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
index 341262667ead87bc9cdc72d6197fe2860ff100f8..791a888a939723987fe351dc5c57263586ea247f 100644
--- a/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
@@ -46,9 +46,9 @@ void InitWithSimplePlatformSupport() {
}
bool Shutdown() {
- CHECK(internal::g_channel_manager);
- delete internal::g_channel_manager;
- internal::g_channel_manager = nullptr;
+ // If |InitIPCSupport()| was called, then |ShutdownIPCSupport()| must have
+ // been called first.
+ CHECK(internal::g_process_type == ProcessType::UNINITIALIZED);
CHECK(internal::g_core);
bool rv = system::internal::ShutdownCheckNoLeaks(internal::g_core);

Powered by Google App Engine
This is Rietveld 408576698