Change userid from a uint32_t to a string guid

components/mus/ws/display_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 <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 60 matching lines @@
   base::MessageLoop message_loop_;
   TestWindowManagerFactory test_window_manager_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayTest);
 };
 
 TEST_F(DisplayTest, CallsCreateDefaultDisplays) {
   const int kNumHostsToCreate = 2;
   connection_manager_delegate_.set_num_displays_to_create(kNumHostsToCreate);
 
-  const UserId kTestId1 = 2;
-  const UserId kTestId2 = 21;
+  const UserId kTestId1 = "2";
+  const UserId kTestId2 = "21";
   WindowManagerFactoryRegistryTestApi(
       connection_manager_->window_manager_factory_registry())
       .AddService(kTestId1, &test_window_manager_factory_);
   // The first register should trigger creation of the default
   // Displays. There should be kNumHostsToCreate Displays.
   EXPECT_EQ(static_cast<size_t>(kNumHostsToCreate),
             connection_manager_->displays().size());
 
   // Each host should have a WindowManagerState for kTestId1.
   for (Display* display : connection_manager_->displays()) {
@@ skipping 16 matching lines @@
     ASSERT_TRUE(state2);
     // Verify the two states have different roots.
     EXPECT_NE(state1, state2);
     EXPECT_NE(state1->root(), state2->root());
   }
 }
 
 TEST_F(DisplayTest, Destruction) {
   connection_manager_delegate_.set_num_displays_to_create(1);
 
-  const UserId kTestId1 = 2;
-  const UserId kTestId2 = 21;
+  const UserId kTestId1 = "2";
+  const UserId kTestId2 = "21";
   WindowManagerFactoryRegistryTestApi(
       connection_manager_->window_manager_factory_registry())
       .AddService(kTestId1, &test_window_manager_factory_);
 
   // Add another registry, should trigger creation of another wm.
   WindowManagerFactoryRegistryTestApi(
       connection_manager_->window_manager_factory_registry())
       .AddService(kTestId2, &test_window_manager_factory_);
   ASSERT_EQ(1u, connection_manager_->displays().size());
   Display* display = *connection_manager_->displays().begin();
@@ skipping 15 matching lines @@
   EXPECT_FALSE(connection_manager_delegate_.got_on_no_more_connections());
   // Destroy the Display, which should shutdown the trees.
   connection_manager_->DestroyDisplay(display);
   EXPECT_EQ(0u, connection_manager_->num_trees());
   EXPECT_TRUE(connection_manager_delegate_.got_on_no_more_connections());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus