Rename shell namespace to service_manager

services/ui/display/platform_screen_ozone.cc

 // Copyright 2016 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/display/platform_screen_ozone.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 44 matching lines @@
 }
 
 PlatformScreenOzone::PlatformScreenOzone() {}
 
 PlatformScreenOzone::~PlatformScreenOzone() {
   // We are shutting down and don't want to make anymore display changes.
   fake_display_controller_ = nullptr;
   display_configurator_.RemoveObserver(this);
 }
 
-void PlatformScreenOzone::AddInterfaces(shell::InterfaceRegistry* registry) {
+void PlatformScreenOzone::AddInterfaces(
+    service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::DisplayController>(this);
 }
 
 void PlatformScreenOzone::Init(PlatformScreenDelegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 
   std::unique_ptr<ui::NativeDisplayDelegate> native_display_delegate =
       ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
 
@@ skipping 179 matching lines @@
   wait_for_display_config_update_ = false;
 }
 
 void PlatformScreenOzone::OnDisplayModeChangeFailed(
     const ui::DisplayConfigurator::DisplayStateList& displays,
     ui::MultipleDisplayState failed_new_state) {
   LOG(ERROR) << "OnDisplayModeChangeFailed from DisplayConfigurator";
   wait_for_display_config_update_ = false;
 }
 
-void PlatformScreenOzone::Create(const shell::Identity& remote_identity,
-                                 mojom::DisplayControllerRequest request) {
+void PlatformScreenOzone::Create(
+    const service_manager::Identity& remote_identity,
+    mojom::DisplayControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display