Rename shell namespace to service_manager

services/ui/public/cpp/tests/window_server_test_base.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 "services/ui/public/cpp/tests/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 71 matching lines @@
   WindowServerServiceTestBase::SetUp();
 
   std::unique_ptr<WindowTreeClient> window_manager_window_tree_client =
       CreateWindowTreeHost(connector(), this, &host_, this);
   window_manager_ = window_manager_window_tree_client.get();
   window_tree_clients_.insert(std::move(window_manager_window_tree_client));
 
   ASSERT_TRUE(DoRunLoopWithTimeout());  // RunLoop should be quit by OnEmbed().
 }
 
-bool WindowServerTestBase::OnConnect(const shell::Identity& remote_identity,
-                                     shell::InterfaceRegistry* registry) {
+bool WindowServerTestBase::OnConnect(
+    const service_manager::Identity& remote_identity,
+    service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::WindowTreeClient>(this);
   return true;
 }
 
 void WindowServerTestBase::OnEmbed(Window* root) {
   most_recent_client_ = root->window_tree();
   EXPECT_TRUE(QuitRunLoop());
   ASSERT_TRUE(window_manager_client_);
   window_manager_client_->AddActivationParent(root);
 }
@@ skipping 70 matching lines @@
     window_manager_delegate_->OnWmCancelMoveLoop(window);
 }
 
 mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id,
                                                        const ui::Event& event) {
   return window_manager_delegate_
              ? window_manager_delegate_->OnAccelerator(accelerator_id, event)
              : mojom::EventResult::UNHANDLED;
 }
 
-void WindowServerTestBase::Create(const shell::Identity& remote_identity,
-                                  mojom::WindowTreeClientRequest request) {
+void WindowServerTestBase::Create(
+    const service_manager::Identity& remote_identity,
+    mojom::WindowTreeClientRequest request) {
   window_tree_clients_.insert(
       base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request)));
 }
 
 }  // namespace ui