Rename shell namespace to service_manager

services/service_manager/tests/shell/shell_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_test.h"
 #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 {
 
 class ShellTestClient
     : public test::ServiceTestClient,
       public InterfaceFactory<test::mojom::CreateInstanceTest>,
       public test::mojom::CreateInstanceTest {
  public:
   explicit ShellTestClient(test::ServiceTest* test)
       : test::ServiceTestClient(test),
@@ skipping 11 matching lines @@
   }
 
   // InterfaceFactory<test::mojom::CreateInstanceTest>:
   void Create(
       const Identity& remote_identity,
       test::mojom::CreateInstanceTestRequest request) override {
     binding_.Bind(std::move(request));
   }
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellTestClient);
 };
 
 }  // namespace
 
 class ShellTest : public test::ServiceTest,
                   public mojom::ServiceManagerListener {
@@ skipping 59 matching lines @@
   void OnInit(std::vector<mojom::ServiceInfoPtr> instances) override {
     for (size_t i = 0; i < instances.size(); ++i)
       initial_instances_.push_back(InstanceInfo(instances[i]->identity));
 
     DCHECK(wait_for_instances_loop_);
     wait_for_instances_loop_->Quit();
   }
   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) {
         instance.pid = pid;
         break;
       }
     }
   }
-  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) {
         instances_.erase(it);
         break;
       }
     }
   }
 
   ShellTestClient* service_;
@@ skipping 44 matching lines @@
     EXPECT_NE(base::kNullProcessId, instance.pid);
   }
 
   driver.set_connection_error_handler(
       base::Bind(&ShellTest::OnDriverQuit,
                  base::Unretained(this)));
   driver->QuitDriver();
   base::RunLoop().Run();
 }
 
-}  // namespace shell
+}  // namespace service_manager