Changes client_token to be client_auth_token.

blimp/net/engine_authentication_handler.cc

 // Copyright 2015 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 "blimp/net/engine_authentication_handler.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/timer/timer.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/logging.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/protocol_version.h"
 #include "blimp/net/blimp_connection.h"
 #include "blimp/net/blimp_message_processor.h"
@@ skipping 12 matching lines @@
 
 // Authenticates one connection. It deletes itself when
 //   * the connection is authenticated and passed to |connection_handler|.
 //   * the connection gets into an error state.
 //   * the auth message does not arrive within a reasonable time.
 class Authenticator : public ConnectionErrorObserver,
                       public BlimpMessageProcessor {
  public:
   explicit Authenticator(std::unique_ptr<BlimpConnection> connection,
                          base::WeakPtr<ConnectionHandler> connection_handler,
-                         const std::string& client_token);
+                         const std::string& client_auth_token);
   ~Authenticator() override;
 
  private:
   // Processes authentication result and deletes |this|.
   void OnConnectionAuthenticated(bool authenticated);
 
   // Handles timeout waiting for auth message, and deletes |this|.
   void OnAuthenticationTimeout();
 
   // ConnectionErrorObserver implementation.
   void OnConnectionError(int error) override;
 
   // BlimpMessageProcessor implementation.
   void ProcessMessage(std::unique_ptr<BlimpMessage> message,
                       const net::CompletionCallback& callback) override;
 
   // The connection to be authenticated.
   std::unique_ptr<BlimpConnection> connection_;
 
   // Handler to pass successfully authenticated connections to.
   base::WeakPtr<ConnectionHandler> connection_handler_;
 
   // Used to authenticate incoming connection.
-  const std::string client_token_;
+  const std::string client_auth_token_;
 
   // A timer to fail authentication on timeout.
   base::OneShotTimer timeout_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(Authenticator);
 };
 
 Authenticator::Authenticator(
     std::unique_ptr<BlimpConnection> connection,
     base::WeakPtr<ConnectionHandler> connection_handler,
-    const std::string& client_token)
+    const std::string& client_auth_token)
     : connection_(std::move(connection)),
       connection_handler_(connection_handler),
-      client_token_(client_token) {
+      client_auth_token_(client_auth_token) {
   DVLOG(1) << "Authenticator object created.";
 
   // Observe for errors that might occur during the authentication phase.
   connection_->AddConnectionErrorObserver(this);
   connection_->SetIncomingMessageProcessor(this);
   timeout_timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kAuthTimeoutDurationInSeconds),
       this, &Authenticator::OnAuthenticationTimeout);
 }
 
@@ skipping 46 matching lines @@
     // show the user an appropriate error.
     connection_->GetOutgoingMessageProcessor()->ProcessMessage(
         CreateEndConnectionMessage(EndConnectionMessage::PROTOCOL_MISMATCH),
         net::CompletionCallback());
 
     OnConnectionAuthenticated(false);
     return;
   }
 
   // Verify that the authentication token matches.
-  bool token_match = client_token_ == start_connection.client_token();
+  bool token_match = client_auth_token_ == start_connection.client_auth_token();
   DVLOG(1) << "Authentication challenge received: "
-           << start_connection.client_token() << ", and token "
+           << start_connection.client_auth_token() << ", and token "
            << (token_match ? " matches" : " does not match");
   OnConnectionAuthenticated(token_match);
 }
 
 }  // namespace
 
 EngineAuthenticationHandler::EngineAuthenticationHandler(
     ConnectionHandler* connection_handler,
-    const std::string& client_token)
+    const std::string& client_auth_token)
     : connection_handler_weak_factory_(connection_handler),
-      client_token_(client_token) {
-  DCHECK(!client_token_.empty());
+      client_auth_token_(client_auth_token) {
+  DCHECK(!client_auth_token_.empty());
 }
 
 EngineAuthenticationHandler::~EngineAuthenticationHandler() {}
 
 void EngineAuthenticationHandler::HandleConnection(
     std::unique_ptr<BlimpConnection> connection) {
   // Authenticator manages its own lifetime.
   new Authenticator(std::move(connection),
                     connection_handler_weak_factory_.GetWeakPtr(),
-                    client_token_);
+                    client_auth_token_);
 }
 
 }  // namespace blimp