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

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

Issue 1465183005: Rename mojo::TokenSerializer to mojo::Broker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win component Created 5 years, 1 month 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: mojo/edk/embedder/test_embedder.cc
diff --git a/mojo/edk/embedder/test_embedder.cc b/mojo/edk/embedder/test_embedder.cc
index 9e82a4e76522cd3ebe435231f7207b35cdf0f0ec..10f50b5d3b538f5c9e840a83a6dfb9ff562849c2 100644
--- a/mojo/edk/embedder/test_embedder.cc
+++ b/mojo/edk/embedder/test_embedder.cc
@@ -9,13 +9,10 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/embedder_internal.h"
#include "mojo/edk/embedder/platform_support.h"
+#include "mojo/edk/system/broker.h"
#include "mojo/edk/system/core.h"
#include "mojo/edk/system/handle_table.h"
-#if defined(OS_WIN)
-#include "mojo/edk/system/token_serializer_win.h"
-#endif
-
namespace mojo {
namespace edk {
@@ -51,11 +48,9 @@ bool Shutdown() {
delete internal::g_platform_support;
internal::g_platform_support = nullptr;
-#if defined(OS_WIN)
- CHECK(internal::g_token_serializer);
- delete internal::g_token_serializer;
- internal::g_token_serializer = nullptr;
-#endif
+ CHECK(internal::g_broker);
+ delete internal::g_broker;
+ internal::g_broker = nullptr;
return rv;
}

Powered by Google App Engine
This is Rietveld 408576698