google_apis/gcm/engine/connection_handler_impl.cc - Issue 118133003: [GCM] Add heartbeat manager and reconnection logic due to heartbeat failure

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: google_apis/gcm/engine/connection_handler_impl.cc

Issue 118133003: [GCM] Add heartbeat manager and reconnection logic due to heartbeat failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 7 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

« no previous file with comments | « google_apis/gcm/engine/connection_handler_impl.h ('k') | google_apis/gcm/engine/connection_handler_impl_unittest.cc » ('j') | google_apis/gcm/engine/heartbeat_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: google_apis/gcm/engine/connection_handler_impl.cc

diff --git a/google_apis/gcm/engine/connection_handler_impl.cc b/google_apis/gcm/engine/connection_handler_impl.cc

index 9772000e0d87d879d6d362d7e39ee4df2aeedb2e..aea168325ba3c3f7a67fc7867fb200b721fe3847 100644

--- a/google_apis/gcm/engine/connection_handler_impl.cc

+++ b/google_apis/gcm/engine/connection_handler_impl.cc

@@ -52,7 +52,7 @@ ConnectionHandlerImpl::~ConnectionHandlerImpl() {

void ConnectionHandlerImpl::Init(

const mcs_proto::LoginRequest& login_request,

- scoped_ptr<net::StreamSocket> socket) {

+ net::StreamSocket* socket) {

DCHECK(!read_callback_.is_null());

DCHECK(!write_callback_.is_null());

DCHECK(!connection_callback_.is_null());

@@ -63,9 +63,9 @@ void ConnectionHandlerImpl::Init(

handshake_complete_ = false;

message_tag_ = 0;

message_size_ = 0;

- socket_ = socket.Pass();

- input_stream_.reset(new SocketInputStream(socket_.get()));

- output_stream_.reset(new SocketOutputStream(socket_.get()));

+ socket_ = socket;

+ input_stream_.reset(new SocketInputStream(socket_));

+ output_stream_.reset(new SocketOutputStream(socket_));

}

@@ -393,8 +393,6 @@ void ConnectionHandlerImpl::OnTimeout() {

void ConnectionHandlerImpl::CloseConnection() {

DVLOG(1) << "Closing connection.";

- read_callback_.Reset();

- write_callback_.Reset();

read_timeout_timer_.Stop();

socket_->Disconnect();

input_stream_.reset();