mojo leveldb: Get profile and leveldb connected to DOMStorageContext.

content/browser/mojo/mojo_shell_context.cc

Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 91fdf545aa7e1168b87bc4e0193e138b96425b6d..bed888915e5a59558f44787f6833cd4a4581628c 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ -160,6 +161,7 @@ class MojoShellContext::Proxy {
   ~Proxy() {}
 
   void ConnectToApplication(
+      const std::string& user_id,
       const std::string& name,
       const std::string& requestor_name,
       mojo::shell::mojom::InterfaceProviderRequest request,
@@ -168,7 +170,7 @@ class MojoShellContext::Proxy {
     if (task_runner_ == base::ThreadTaskRunnerHandle::Get()) {
       if (shell_context_) {
         shell_context_->ConnectToApplicationOnOwnThread(
-            name, requestor_name, std::move(request),
+            user_id, name, requestor_name, std::move(request),
             std::move(exposed_services), callback);
       }
     } else {
@@ -177,9 +179,9 @@ class MojoShellContext::Proxy {
       task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&MojoShellContext::ConnectToApplicationOnOwnThread,
-                     base::Unretained(shell_context_), name, requestor_name,
-                     base::Passed(&request), base::Passed(&exposed_services),
-                     callback));
+                     base::Unretained(shell_context_), user_id, name,
+                     requestor_name, base::Passed(&request),
+                     base::Passed(&exposed_services), callback));
     }
   }
 
@@ -271,26 +273,28 @@ MojoShellContext::~MojoShellContext() {
 
 // static
 void MojoShellContext::ConnectToApplication(
+    const std::string& user_id,
     const std::string& name,
     const std::string& requestor_name,
     mojo::shell::mojom::InterfaceProviderRequest request,
     mojo::shell::mojom::InterfaceProviderPtr exposed_services,
     const mojo::shell::mojom::Connector::ConnectCallback& callback) {
-  proxy_.Get()->ConnectToApplication(name, requestor_name, std::move(request),
-                                     std::move(exposed_services), callback);
+  proxy_.Get()->ConnectToApplication(
+      user_id, name, requestor_name, std::move(request),
+      std::move(exposed_services), callback);
 }
 
 void MojoShellContext::ConnectToApplicationOnOwnThread(
+    const std::string& user_id,
     const std::string& name,
     const std::string& requestor_name,
     mojo::shell::mojom::InterfaceProviderRequest request,
     mojo::shell::mojom::InterfaceProviderPtr exposed_services,
     const mojo::shell::mojom::Connector::ConnectCallback& callback) {
   scoped_ptr<mojo::shell::ConnectParams> params(new mojo::shell::ConnectParams);
-  // TODO(beng): kRootUserID is obviously wrong.
-  mojo::Identity source_id(requestor_name, mojo::shell::mojom::kRootUserID);
+  mojo::Identity source_id(requestor_name, user_id);
   params->set_source(source_id);
-  params->set_target(mojo::Identity(name, mojo::shell::mojom::kRootUserID));
+  params->set_target(mojo::Identity(name, user_id));
   params->set_remote_interfaces(std::move(request));
   params->set_local_interfaces(std::move(exposed_services));
   params->set_connect_callback(callback);