Update GnubbyAuthHandler to use the current session ID

remoting/host/security_key/gnubby_auth_handler_linux_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 39 matching lines @@
  public:
   GnubbyAuthHandlerLinuxTest()
       : run_loop_(new base::RunLoop()), last_connection_id_received_(-1) {
     EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
     socket_path_ = temp_dir_.path().Append(kSocketFilename);
     remoting::GnubbyAuthHandler::SetGnubbySocketName(socket_path_);
 
     send_message_callback_ =
         base::Bind(&GnubbyAuthHandlerLinuxTest::SendMessageToClient,
                    base::Unretained(this));
-    auth_handler_ = remoting::GnubbyAuthHandler::Create(send_message_callback_);
+    session_id_callback_ = base::Bind(&GnubbyAuthHandlerLinuxTest::GetSessionId,
+                                      base::Unretained(this));
+    auth_handler_ = remoting::GnubbyAuthHandler::Create(send_message_callback_,
+                                                        session_id_callback_);
   }
 
   void WaitForSendMessageToClient() {
     run_loop_->Run();
     run_loop_.reset(new base::RunLoop);
   }
 
   void SendMessageToClient(int connection_id, const std::string& data) {
     last_connection_id_received_ = connection_id;
     last_message_received_ = data;
     run_loop_->Quit();
   }
 
+  uint32_t GetSessionId() const { return UINT32_MAX; }

[Sergey Ulanov, 2016/06/27 23:51:58]

can be a static function.

+
   void CheckHostDataMessage(int id, const std::string& expected_data) {
     ASSERT_EQ(id, last_connection_id_received_);
     ASSERT_EQ(expected_data.length(), last_message_received_.length());
     ASSERT_EQ(expected_data, last_message_received_);
   }
 
   void WriteRequestData(net::UnixDomainClientSocket* client_socket) {
     int request_len = sizeof(kRequestData);
     scoped_refptr<net::DrainableIOBuffer> request_buffer(
         new net::DrainableIOBuffer(
@@ skipping 29 matching lines @@
   }
 
  protected:
   base::MessageLoopForIO message_loop_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
   // Object under test.
   std::unique_ptr<GnubbyAuthHandler> auth_handler_;
 
   GnubbyAuthHandler::SendMessageCallback send_message_callback_;
+  GnubbyAuthHandler::SessionIdCallback session_id_callback_;
 
   int last_connection_id_received_;
   std::string last_message_received_;
 
   base::ScopedTempDir temp_dir_;
   base::FilePath socket_path_;
   base::Closure accept_callback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GnubbyAuthHandlerLinuxTest);
@@ skipping 105 matching lines @@
   net::UnixDomainClientSocket client_socket(socket_path_.value(), false);
   net::TestCompletionCallback connect_callback;
   int rv = client_socket.Connect(connect_callback.callback());
   ASSERT_EQ(net::OK, connect_callback.GetResult(rv));
 
   auth_handler_->SendErrorAndCloseConnection(1);
   ASSERT_EQ(0u, auth_handler_->GetActiveConnectionCountForTest());
 }
 
 }  // namespace remoting