1 files changed, 6 insertions, 1 deletions
diff --git a/chromium/google_apis/gcm/engine/fake_connection_handler.cc b/chromium/google_apis/gcm/engine/fake_connection_handler.cc
index 06639331ebe..3e5d5ac2770 100644
--- a/chromium/google_apis/gcm/engine/fake_connection_handler.cc
+++ b/chromium/google_apis/gcm/engine/fake_connection_handler.cc
@@ -39,7 +39,8 @@ FakeConnectionHandler::~FakeConnectionHandler() {
 }
 
 void FakeConnectionHandler::Init(const mcs_proto::LoginRequest& login_request,
-                                 scoped_ptr<net::StreamSocket> socket) {
+                                 net::StreamSocket* socket) {
+  ASSERT_GE(expected_outgoing_messages_.size(), 1U);
   EXPECT_EQ(expected_outgoing_messages_.front().SerializeAsString(),
             login_request.SerializeAsString());
   expected_outgoing_messages_.pop_front();
@@ -48,6 +49,10 @@ void FakeConnectionHandler::Init(const mcs_proto::LoginRequest& login_request,
   initialized_ = !fail_login_;
 }
 
+void FakeConnectionHandler::Reset() {
+  initialized_ = false;
+}
+
 bool FakeConnectionHandler::CanSendMessage() const {
   return initialized_;
 }