Change userid from a uint32_t to a string guid

mojo/shell/tests/connect/connect_test_package.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 <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 33 matching lines @@
         request_(std::move(request)) {
     Start();
   }
   ~ProvidedShellClient() override {
     Join();
   }
 
  private:
   // mojo::ShellClient:
   void Initialize(Connector* connector, const std::string& name,
-                  uint32_t id, uint32_t user_id) override {
+                  const std::string& user_id, uint32_t id) override {
     name_ = name;
     id_ = id;
     userid_ = user_id;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     connection->AddInterface<test::mojom::BlockedInterface>(this);
@@ skipping 43 matching lines @@
     delete this;
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   std::string name_;
   uint32_t id_ = mojom::Connector::kInvalidApplicationID;
-  uint32_t userid_ = mojom::Connector::kUserRoot;
+  std::string userid_ = mojom::kRootUserID;
   const std::string title_;
   mojom::ShellClientRequest request_;
   test::mojom::ExposedInterfacePtr caller_;
   BindingSet<test::mojom::ConnectTestService> bindings_;
   BindingSet<test::mojom::BlockedInterface> blocked_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ProvidedShellClient);
 };
 
 class ConnectTestShellClient
     : public ShellClient,
       public InterfaceFactory<mojom::ShellClientFactory>,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ShellClientFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestShellClient() {}
   ~ConnectTestShellClient() override {}
 
  private:
   // mojo::ShellClient:
   void Initialize(Connector* connector, const std::string& name,
-                  uint32_t id, uint32_t user_id) override {
+                  const std::string& user_id, uint32_t id) override {
     bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<ShellClientFactory>(this);
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
   void ShellConnectionLost() override {
@@ skipping 43 matching lines @@
 
 }  // namespace shell
 }  // namespace mojo
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = mojo::ApplicationRunner(
       new mojo::shell::ConnectTestShellClient).Run(shell_handle);
   return rv;
 }