Change userid from a uint32_t to a string guid

mojo/shell/tests/loader_unittest.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 <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 371 matching lines @@
               InterfaceRequest<TestC> request) override {
     new TestCImpl(connection, context_, std::move(request));
   }
 
   TesterContext* context_;
   scoped_ptr<ShellConnection> app_;
   std::string requestor_name_;
   ScopedVector<TestAImpl> a_bindings_;
 };
 
-void OnConnect(base::RunLoop* loop, uint32_t instance_id, uint32_t user_id) {
+void OnConnect(base::RunLoop* loop, const String& user_id,
+               uint32_t instance_id) {
   loop->Quit();
 }
 
 class LoaderTest : public testing::Test {
  public:
   LoaderTest() : tester_context_(&loop_) {}
   ~LoaderTest() override {}
 
   void SetUp() override {
     shell_.reset(new Shell(nullptr, nullptr, nullptr));
@@ skipping 112 matching lines @@
   EXPECT_TRUE(c.encountered_error());
 }
 
 TEST_F(LoaderTest, TestEndApplicationClosure) {
   ClosingLoader* loader = new ClosingLoader();
   shell_->SetLoaderForName(scoped_ptr<Loader>(loader), "test:test");
 
   bool called = false;
   scoped_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateShellIdentity());
-  params->set_target(Identity("test:test", "", mojom::Connector::kUserRoot));
+  params->set_target(Identity("test:test", "", mojom::kRootUserID));
   shell_->SetInstanceQuitCallback(
       base::Bind(&QuitClosure, params->target(), &called));
   shell_->Connect(std::move(params));
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 TEST_F(LoaderTest, SameIdentityShouldNotCauseDuplicateLoad) {
   // 1 because LoaderTest connects once at startup.
   EXPECT_EQ(1, test_loader_->num_loads());
 
   TestServicePtr test_service;
   ConnectToInterface("test:foo", &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   // Exactly the same name as above.
   ConnectToInterface("test:foo", &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   // A different identity because the domain is different.
   ConnectToInterface("test:bar", &test_service);
   EXPECT_EQ(3, test_loader_->num_loads());
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo