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

Unified Diff: services/service_manager/tests/shell/shell_unittest.cc

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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
Index: services/service_manager/tests/shell/shell_unittest.cc
diff --git a/services/service_manager/tests/shell/shell_unittest.cc b/services/service_manager/tests/shell/shell_unittest.cc
index 42110d4edb7d7b11f0f5d7ce7856f1a72f7df1bb..6c2e76557274039721d39b2c12c9813afec352c4 100644
--- a/services/service_manager/tests/shell/shell_unittest.cc
+++ b/services/service_manager/tests/shell/shell_unittest.cc
@@ -21,7 +21,7 @@
#include "services/service_manager/public/interfaces/service_manager.mojom.h"
#include "services/service_manager/tests/shell/shell_unittest.mojom.h"
-namespace shell {
+namespace service_manager {
namespace {
@@ -53,12 +53,12 @@ class ShellTestClient
}
// test::mojom::CreateInstanceTest:
- void SetTargetIdentity(const shell::Identity& identity) override {
+ void SetTargetIdentity(const service_manager::Identity& identity) override {
target_identity_ = identity;
base::MessageLoop::current()->QuitWhenIdle();
}
- shell::Identity target_identity_;
+ service_manager::Identity target_identity_;
mojo::Binding<test::mojom::CreateInstanceTest> binding_;
@@ -138,7 +138,7 @@ class ShellTest : public test::ServiceTest,
void OnServiceCreated(mojom::ServiceInfoPtr instance) override {
instances_.push_back(InstanceInfo(instance->identity));
}
- void OnServiceStarted(const shell::Identity& identity,
+ void OnServiceStarted(const service_manager::Identity& identity,
uint32_t pid) override {
for (auto& instance : instances_) {
if (instance.identity == identity) {
@@ -147,7 +147,7 @@ class ShellTest : public test::ServiceTest,
}
}
}
- void OnServiceStopped(const shell::Identity& identity) override {
+ void OnServiceStopped(const service_manager::Identity& identity) override {
for (auto it = instances_.begin(); it != instances_.end(); ++it) {
auto& instance = *it;
if (instance.identity == identity) {
@@ -212,4 +212,4 @@ TEST_F(ShellTest, CreateInstance) {
base::RunLoop().Run();
}
-} // namespace shell
+} // namespace service_manager
« no previous file with comments | « services/service_manager/tests/shell/driver_manifest.json ('k') | services/service_manager/tests/shell/shell_unittest.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698