Revert of Don't use barcodes in ProtocolPerfTests

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 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 "remoting/host/chromoting_host.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 160 matching lines @@
 }
 
 void ChromotingHost::OnSessionAuthenticated(ClientSession* client) {
   DCHECK(CalledOnValidThread());
 
   login_backoff_.Reset();
 
   // Disconnect all other clients. |it| should be advanced before Disconnect()
   // is called to avoid it becoming invalid when the client is removed from
   // the list.
-  ClientSessions::iterator it = clients_.begin();
+  ClientList::iterator it = clients_.begin();
   base::WeakPtr<ChromotingHost> self = weak_factory_.GetWeakPtr();
   while (it != clients_.end()) {
-    ClientSession* other_client = it->get();
-    ++it;
+    ClientSession* other_client = *it++;
     if (other_client != client) {
       other_client->DisconnectSession(protocol::OK);
 
       // Quit if the host was destroyed.
       if (!self)
         return;
     }
   }
 
   // Disconnects above must have destroyed all other clients.
@@ skipping 18 matching lines @@
   DCHECK(CalledOnValidThread());
 
   // Notify observers.
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_,
                     OnAccessDenied(client->client_jid()));
 }
 
 void ChromotingHost::OnSessionClosed(ClientSession* client) {
   DCHECK(CalledOnValidThread());
 
-  ClientSessions::iterator it =
-      std::find_if(clients_.begin(), clients_.end(),
-                   [client](const std::unique_ptr<ClientSession>& item) {
-                     return item.get() == client;
-                   });
+  ClientList::iterator it = std::find(clients_.begin(), clients_.end(), client);
   CHECK(it != clients_.end());
 
   bool was_authenticated = client->is_authenticated();
   std::string jid = client->client_jid();
   clients_.erase(it);
+  delete client;
 
   if (was_authenticated) {
     FOR_EACH_OBSERVER(HostStatusObserver, status_observers_,
                       OnClientDisconnected(jid));
   }
 }
 
 void ChromotingHost::OnSessionRouteChange(
     ClientSession* session,
     const std::string& channel_name,
@@ skipping 29 matching lines @@
     connection.reset(new protocol::WebrtcConnectionToClient(
         base::WrapUnique(session), transport_context_,
         video_encode_task_runner_, audio_task_runner_));
   } else {
     connection.reset(new protocol::IceConnectionToClient(
         base::WrapUnique(session), transport_context_,
         video_encode_task_runner_, audio_task_runner_));
   }
 
   // Create a ClientSession object.
-  clients_.push_back(base::MakeUnique<ClientSession>(
+  ClientSession* client = new ClientSession(
       this, std::move(connection), desktop_environment_factory_,
-      max_session_duration_, pairing_registry_, extensions_.get()));
+      max_session_duration_, pairing_registry_, extensions_.get());
+
+  clients_.push_back(client);
 }
 
 void ChromotingHost::DisconnectAllClients() {
   DCHECK(CalledOnValidThread());
 
   while (!clients_.empty()) {
     size_t size = clients_.size();
     clients_.front()->DisconnectSession(protocol::OK);
     CHECK_EQ(clients_.size(), size - 1);
   }
 }
 
 }  // namespace remoting