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

Unified Diff: mojo/edk/system/channel.cc

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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/system/channel.cc
diff --git a/mojo/edk/system/channel.cc b/mojo/edk/system/channel.cc
index 3d6c54f57cf56004f5c6c5ccc1356e1a9bd11085..1e26145a6e0c38f0c102071fc638f77162400e63 100644
--- a/mojo/edk/system/channel.cc
+++ b/mojo/edk/system/channel.cc
@@ -72,7 +72,7 @@ void Channel::Shutdown() {
size_t num_zombies = 0;
for (IdToEndpointMap::iterator it = to_destroy.begin();
it != to_destroy.end(); ++it) {
- if (it->second.get()) {
+ if (it->second) {
num_live++;
it->second->DetachFromChannel();
} else {
@@ -97,7 +97,7 @@ void Channel::WillShutdownSoon() {
ChannelEndpointId Channel::AttachAndRunEndpoint(
scoped_refptr<ChannelEndpoint> endpoint,
bool is_bootstrap) {
- DCHECK(endpoint.get());
+ DCHECK(endpoint);
ChannelEndpointId local_id;
ChannelEndpointId remote_id;
@@ -185,7 +185,7 @@ void Channel::DetachEndpoint(ChannelEndpoint* endpoint,
if (it == local_id_to_endpoint_map_.end() || it->second.get() != endpoint)
return;
- DCHECK(it->second.get());
+ DCHECK(it->second);
it->second = nullptr;
// Send a remove message outside the lock.
@@ -306,7 +306,7 @@ void Channel::OnReadMessageForEndpoint(
local_id_to_endpoint_map_.find(local_id);
if (it != local_id_to_endpoint_map_.end()) {
// Ignore messages for zombie endpoints (not an error).
- if (!it->second.get()) {
+ if (!it->second) {
DVLOG(2) << "Ignoring downstream message for zombie endpoint (local ID "
"= " << local_id
<< ", remote ID = " << message_view.source_id() << ")";
@@ -316,7 +316,7 @@ void Channel::OnReadMessageForEndpoint(
endpoint = it->second;
}
}
- if (!endpoint.get()) {
+ if (!endpoint) {
HandleRemoteError(base::StringPrintf(
"Received a message for nonexistent local destination ID %u",
static_cast<unsigned>(local_id.value())));
@@ -453,7 +453,7 @@ bool Channel::OnRemoveMessagePipeEndpoint(ChannelEndpointId local_id,
return false;
}
- if (!it->second.get()) {
+ if (!it->second) {
// Remove messages "crossed"; we have to wait for the ack.
return true;
}
@@ -489,7 +489,7 @@ bool Channel::OnRemoveMessagePipeEndpointAck(ChannelEndpointId local_id) {
return false;
}
- if (it->second.get()) {
+ if (it->second) {
DVLOG(2) << "Remove message pipe endpoint ack error: wrong state";
return false;
}

Powered by Google App Engine
This is Rietveld 408576698