diff options
| author | vasilii <vasilii@chromium.org> | 2016-03-11 02:40:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 10:41:44 +0000 |
| commit | e688e425a760a03816244f4b3c7996958e333b5b (patch) | |
| tree | e1eeaa052917a5551d8f774f8c6e3ed573845bb0 /mojo/shell/standalone | |
| parent | 6b84474a3a718e09d19280edfa6065564b249ea6 (diff) | |
| download | chromium_src-e688e425a760a03816244f4b3c7996958e333b5b.zip chromium_src-e688e425a760a03816244f4b3c7996958e333b5b.tar.gz chromium_src-e688e425a760a03816244f4b3c7996958e333b5b.tar.bz2 | |
Revert of Remove loader for catalog & some other cleanup (patchset #4 id:60001 of https://codereview.chromium.org/1785743002/ )
Reason for revert:
Based on https://codereview.chromium.org/1781913003 which broke mojo_shell_unittests on Linux.
Original issue's description:
> Remove loader for catalog & some other cleanup:
>
> - instantiate the catalog shell client directly in the shell
> - remove some obsolete comments
> - move userid inheritance handling into the instance
>
> R=sky@chromium.org
>
> Committed: https://crrev.com/ecae0ae5f672a04579ab563462531889f6c0fab9
> Cr-Commit-Position: refs/heads/master@{#380575}
TBR=sky@chromium.org,ben@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1783123006
Cr-Commit-Position: refs/heads/master@{#380594}
Diffstat (limited to 'mojo/shell/standalone')
| -rw-r--r-- | mojo/shell/standalone/context.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index 4e847fb..23dc96b 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -134,6 +134,7 @@ void Context::Init(scoped_ptr<InitParams> init_params) { blocking_pool_ = new base::SequencedWorkerPool(kMaxBlockingPoolThreads, "blocking_pool"); + // TODO(vtl): This should be MASTER, not NONE. edk::InitIPCSupport(this, io_thread_->task_runner().get()); scoped_ptr<NativeRunnerFactory> runner_factory; @@ -163,7 +164,7 @@ void Context::Init(scoped_ptr<InitParams> init_params) { scoped_ptr<ConnectParams> params(new ConnectParams); params->set_source(CreateShellIdentity()); - params->set_target(Identity("mojo:tracing", mojom::kRootUserID)); + params->set_target(Identity("mojo:tracing", mojom::kInheritUserID)); params->set_remote_interfaces(GetProxy(&tracing_remote_interfaces)); params->set_local_interfaces(std::move(tracing_local_interfaces)); shell_->Connect(std::move(params)); |