| Index: mojo/edk/system/parent_token_serializer_state_win.h
|
| diff --git a/mojo/edk/system/parent_token_serializer_state_win.h b/mojo/edk/system/parent_token_serializer_state_win.h
|
| index d16a368d900623f8839ec411032f64dab7f1ac80..c1db1cfc10f8e8decfdc694164eeaa98efd279e6 100644
|
| --- a/mojo/edk/system/parent_token_serializer_state_win.h
|
| +++ b/mojo/edk/system/parent_token_serializer_state_win.h
|
| @@ -6,7 +6,7 @@
|
| #define MOJO_EDK_SYSTEM_PARENT_TOKEN_SERIALIZER_STATE_WIN_H_
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "base/containers/hash_tables.h"
|
| +#include "base/containers/hash_tables.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread.h"
|
| @@ -22,7 +22,7 @@ namespace edk {
|
| // TokenSerializer interface for use by code in the parent process.
|
| class MOJO_SYSTEM_IMPL_EXPORT ParentTokenSerializerState
|
| : NON_EXPORTED_BASE(public TokenSerializer) {
|
| - public:
|
| + public:
|
| static ParentTokenSerializerState* GetInstance();
|
|
|
| // TokenSerializer implementation.
|
| @@ -39,11 +39,11 @@ class MOJO_SYSTEM_IMPL_EXPORT ParentTokenSerializerState
|
| return token_serialize_thread_.task_runner();
|
| }
|
|
|
| - private:
|
| + private:
|
| friend struct base::DefaultSingletonTraits<ParentTokenSerializerState>;
|
|
|
| ParentTokenSerializerState();
|
| - virtual ~ParentTokenSerializerState();
|
| + ~ParentTokenSerializerState() override;
|
|
|
| // A separate thread to handle sync IPCs from child processes for exchanging
|
| // platform handles with tokens. We use a separate thread because latency is
|
|
|