Change userid from a uint32_t to a string guid

mojo/shell/public/cpp/lib/connection_impl.cc

 // Copyright 2014 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 "mojo/shell/public/cpp/lib/connection_impl.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/interface_binder.h"
 
 namespace mojo {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConnectionImpl, public:
 
 ConnectionImpl::ConnectionImpl(
     const std::string& connection_name,
     const std::string& remote_name,
     uint32_t remote_id,
-    uint32_t remote_user_id,
+    const std::string& remote_user_id,
     shell::mojom::InterfaceProviderPtr remote_interfaces,
     shell::mojom::InterfaceProviderRequest local_interfaces,
     const std::set<std::string>& allowed_interfaces)
     : connection_name_(connection_name),
       remote_name_(remote_name),
       remote_id_(remote_id),
       remote_ids_valid_(
           remote_id != shell::mojom::Connector::kInvalidApplicationID),
       remote_user_id_(remote_user_id),
       local_registry_(std::move(local_interfaces), this),
@@ skipping 21 matching lines @@
 // ConnectionImpl, Connection implementation:
 
 const std::string& ConnectionImpl::GetConnectionName() {
   return connection_name_;
 }
 
 const std::string& ConnectionImpl::GetRemoteApplicationName() {
   return remote_name_;
 }
 
-uint32_t ConnectionImpl::GetRemoteUserID() const {
+const std::string& ConnectionImpl::GetRemoteUserID() const {
   return remote_user_id_;
 }
 
 void ConnectionImpl::SetRemoteInterfaceProviderConnectionErrorHandler(
     const Closure& handler) {
   remote_interfaces_.set_connection_error_handler(handler);
 }
 
 bool ConnectionImpl::GetRemoteApplicationID(uint32_t* remote_id) const {
   if (!remote_ids_valid_)
@@ skipping 23 matching lines @@
   return &local_registry_;
 }
 
 base::WeakPtr<Connection> ConnectionImpl::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConnectionImpl, private:
 
-void ConnectionImpl::OnGotInstanceID(uint32_t target_application_id,
-                                     uint32_t target_user_id) {
+void ConnectionImpl::OnGotInstanceID(const std::string& target_user_id,
+                                     uint32_t target_application_id) {
   DCHECK(!remote_ids_valid_);
   remote_ids_valid_ = true;
 
   remote_id_ = target_application_id;
   remote_user_id_= target_user_id;
   std::vector<Closure> callbacks;
   callbacks.swap(remote_id_callbacks_);
   for (auto callback : callbacks)
     callback.Run();
 }
 
 }  // namespace internal
 }  // namespace mojo