Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: mojo/shell/tests/shell/driver.cc

Issue 1769163002: Add a instance groups to Connect(), and introduce an Identity struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/tests/loader_unittest.cc ('k') | mojo/shell/tests/shell/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/tests/shell/driver.cc
diff --git a/mojo/shell/tests/shell/driver.cc b/mojo/shell/tests/shell/driver.cc
index 62c57bfc91c8d071906e68e37660f8fac2e6b77d..68254f89e4a0b284359d221aea3155108f2779fc 100644
--- a/mojo/shell/tests/shell/driver.cc
+++ b/mojo/shell/tests/shell/driver.cc
@@ -44,8 +44,8 @@ class Driver : public mojo::ShellClient,
private:
// mojo::ShellClient:
- void Initialize(mojo::Connector* connector, const std::string& name,
- const std::string& user_id, uint32_t id) override {
+ void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
+ uint32_t id) override {
base::FilePath target_path;
CHECK(base::PathService::Get(base::DIR_EXE, &target_path));
#if defined(OS_WIN)
@@ -98,9 +98,12 @@ class Driver : public mojo::ShellClient,
mojo::shell::mojom::ShellPtr shell;
connector->ConnectToInterface("mojo:shell", &shell);
- shell->CreateInstance(std::move(factory), "exe:shell_unittest_target",
- mojo::shell::mojom::kInheritUserID, std::move(filter),
- std::move(request),
+ mojo::shell::mojom::IdentityPtr target(mojo::shell::mojom::Identity::New());
+ target->name = "exe:shell_unittest_target";
+ target->user_id = mojo::shell::mojom::kInheritUserID;
+ target->instance = "";
+ shell->CreateInstance(std::move(factory), std::move(target),
+ std::move(filter), std::move(request),
base::Bind(&Driver::OnConnectionCompleted,
base::Unretained(this)));
« no previous file with comments | « mojo/shell/tests/loader_unittest.cc ('k') | mojo/shell/tests/shell/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698