Rename shell namespace to service_manager

services/ui/ws/window_tree_client_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "services/service_manager/public/cpp/service_test.h"
 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/test_change_tracker.h"
 
 using mojo::Array;
-using shell::Connection;
+using service_manager::Connection;
 using mojo::InterfaceRequest;
-using shell::Service;
+using service_manager::Service;
 using mojo::String;
 using ui::mojom::WindowDataPtr;
 using ui::mojom::WindowTree;
 using ui::mojom::WindowTreeClient;
 
 namespace ui {
 namespace ws {
 namespace test {
 
 namespace {
@@ skipping 16 matching lines @@
 
 void EmbedCallbackImpl(base::RunLoop* run_loop,
                        bool* result_cache,
                        bool result) {
   *result_cache = result;
   run_loop->Quit();
 }
 
 // -----------------------------------------------------------------------------
 
-bool EmbedUrl(shell::Connector* connector,
+bool EmbedUrl(service_manager::Connector* connector,
               WindowTree* tree,
               const String& url,
               Id root_id) {
   bool result = false;
   base::RunLoop run_loop;
   {
     mojom::WindowTreeClientPtr client;
     connector->ConnectToInterface(url.get(), &client);
     const uint32_t embed_flags = 0;
     tree->Embed(root_id, std::move(client), embed_flags,
@@ skipping 427 matching lines @@
       window_manager_binding_;
   mojom::WindowManagerClientAssociatedPtr window_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClient);
 };
 
 // -----------------------------------------------------------------------------
 
 // InterfaceFactory for vending TestWindowTreeClients.
 class WindowTreeClientFactory
-    : public shell::InterfaceFactory<WindowTreeClient> {
+    : public service_manager::InterfaceFactory<WindowTreeClient> {
  public:
   WindowTreeClientFactory() {}
   ~WindowTreeClientFactory() override {}
 
   // Runs a nested MessageLoop until a new instance has been created.
   std::unique_ptr<TestWindowTreeClient> WaitForInstance() {
     if (!client_impl_.get()) {
       DCHECK(!run_loop_);
       run_loop_ = base::MakeUnique<base::RunLoop>();
       run_loop_->Run();
       run_loop_.reset();
     }
     return std::move(client_impl_);
   }
 
  private:
   // InterfaceFactory<WindowTreeClient>:
-  void Create(const shell::Identity& remote_identity,
+  void Create(const service_manager::Identity& remote_identity,
               InterfaceRequest<WindowTreeClient> request) override {
     client_impl_ = base::MakeUnique<TestWindowTreeClient>();
     client_impl_->Bind(std::move(request));
     if (run_loop_.get())
       run_loop_->Quit();
   }
 
   std::unique_ptr<TestWindowTreeClient> client_impl_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
@@ skipping 88 matching lines @@
     client->WaitForOnEmbed();
 
     EXPECT_EQ("OnEmbed",
               SingleChangeToDescription(*client->tracker()->changes()));
     if (client_id)
       *client_id = (*client->tracker()->changes())[0].client_id;
     return client;
   }
 
   // WindowServerServiceTestBase:
-  bool OnConnect(const shell::Identity& remote_identity,
-                 shell::InterfaceRegistry* registry) override {
+  bool OnConnect(const service_manager::Identity& remote_identity,
+                 service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface(client_factory_.get());
     return true;
   }
 
   void SetUp() override {
     client_factory_ = base::MakeUnique<WindowTreeClientFactory>();
 
     WindowServerServiceTestBase::SetUp();
 
     mojom::WindowTreeHostFactoryPtr factory;
@@ skipping 1529 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui