Use ash_util::IsRunningInMash in chromeos::OutputProtectionDelegate

chrome/browser/chromeos/display/output_protection_delegate.cc

 // Copyright 2013 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 "chrome/browser/chromeos/display/output_protection_delegate.h"
 
 #include "chrome/browser/chromeos/display/output_protection_controller_ash.h"
 #include "chrome/browser/chromeos/display/output_protection_controller_mus.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
-#include "services/service_manager/runner/common/client_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/display/types/display_constants.h"
 
 namespace chromeos {
 
 namespace {
 
-bool IsRunningInMash() {
-  return service_manager::ServiceManagerIsRemote();
-}
-
 bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64_t* display_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(rfh);
   DCHECK(display_id);
 
   display::Screen* screen = display::Screen::GetScreen();
   if (!screen)
     return false;
   display::Display display =
       screen->GetDisplayNearestWindow(rfh->GetNativeView());
@@ skipping 65 matching lines @@
   }
 
   int64_t display_id = display::kInvalidDisplayId;
   if (!GetCurrentDisplayId(rfh, &display_id))
     return false;
 
   aura::Window* window = rfh->GetNativeView();
   if (!window)
     return false;
 
-  if (IsRunningInMash())
+  if (chrome::IsRunningInMash())
     controller_ = base::MakeUnique<OutputProtectionControllerMus>();
   else
     controller_ = base::MakeUnique<OutputProtectionControllerAsh>();
 
   display_id_ = display_id;
   window_ = window;
   window_->AddObserver(this);
   return true;
 }
 
@@ skipping 24 matching lines @@
   display_id_ = new_display_id;
 }
 
 void OutputProtectionDelegate::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window, window_);
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace chromeos