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

Unified Diff: third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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/system/test_channel_endpoint_client.h
diff --git a/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h b/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h
index c2347d56435076320803dd71831a610d27caab85..bb812f01956e1bef2e498df5057e6a8eca21b7ec 100644
--- a/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h
+++ b/third_party/mojo/src/mojo/edk/system/test_channel_endpoint_client.h
@@ -7,10 +7,10 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
#include "mojo/edk/system/channel_endpoint.h"
#include "mojo/edk/system/channel_endpoint_client.h"
#include "mojo/edk/system/message_in_transit_queue.h"
+#include "mojo/edk/system/mutex.h"
#include "mojo/public/cpp/system/macros.h"
namespace base {
@@ -49,15 +49,15 @@ class TestChannelEndpointClient final : public ChannelEndpointClient {
private:
~TestChannelEndpointClient() override;
- mutable base::Lock lock_; // Protects the members below.
+ mutable Mutex mutex_;
- unsigned port_;
- scoped_refptr<ChannelEndpoint> endpoint_;
+ unsigned port_ MOJO_GUARDED_BY(mutex_);
+ scoped_refptr<ChannelEndpoint> endpoint_ MOJO_GUARDED_BY(mutex_);
- MessageInTransitQueue messages_;
+ MessageInTransitQueue messages_ MOJO_GUARDED_BY(mutex_);
// Event to trigger if we read a message (may be null).
- base::WaitableEvent* read_event_;
+ base::WaitableEvent* read_event_ MOJO_GUARDED_BY(mutex_);
MOJO_DISALLOW_COPY_AND_ASSIGN(TestChannelEndpointClient);
};

Powered by Google App Engine
This is Rietveld 408576698