| Index: mojo/shell/tests/shell/driver.cc
|
| diff --git a/mojo/shell/tests/shell/driver.cc b/mojo/shell/tests/shell/driver.cc
|
| index d8ea10f7db46ae00584331cb05dc0c5f6ddf553b..c7dc2813503db44ee5c5a62ca6992b55698508e6 100644
|
| --- a/mojo/shell/tests/shell/driver.cc
|
| +++ b/mojo/shell/tests/shell/driver.cc
|
| @@ -45,7 +45,7 @@ class Driver : public mojo::ShellClient,
|
| private:
|
| // mojo::ShellClient:
|
| void Initialize(mojo::Connector* connector, const std::string& name,
|
| - uint32_t id, uint32_t user_id) override {
|
| + const std::string& user_id, uint32_t id) override {
|
| base::FilePath target_path;
|
| CHECK(base::PathService::Get(base::DIR_EXE, &target_path));
|
| #if defined(OS_WIN)
|
| @@ -100,7 +100,7 @@ class Driver : public mojo::ShellClient,
|
| connector->ConnectToInterface("mojo:shell", &shell);
|
| shell->CreateInstanceForFactory(std::move(factory),
|
| "exe:shell_unittest_target",
|
| - mojo::shell::mojom::Connector::kUserInherit,
|
| + mojo::shell::mojom::kInheritUserID,
|
| std::move(filter), std::move(request));
|
|
|
| base::LaunchOptions options;
|
|
|