Replace more hardcoded "ash" strings with ash::mojom::kServiceName

chrome/browser/ui/ash/media_client.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 "chrome/browser/ui/ash/media_client.h"
 
+#include "ash/public/interfaces/constants.mojom.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/service_manager_connection.h"
 #include "extensions/browser/app_window/app_window.h"
@@ skipping 98 matching lines @@
   return media_state;
 }
 
 }  // namespace
 
 MediaClient::MediaClient() : binding_(this), weak_ptr_factory_(this) {
   MediaCaptureDevicesDispatcher::GetInstance()->AddObserver(this);
 
   service_manager::Connector* connector =
       content::ServiceManagerConnection::GetForProcess()->GetConnector();
-  connector->BindInterface(ash_util::GetAshServiceName(), &media_controller_);
+  connector->BindInterface(ash::mojom::kServiceName, &media_controller_);
 
   // Register this object as the client interface implementation.
   ash::mojom::MediaClientAssociatedPtrInfo ptr_info;
   binding_.Bind(&ptr_info);
   media_controller_->SetClient(std::move(ptr_info));
 }
 
 MediaClient::~MediaClient() {
   MediaCaptureDevicesDispatcher::GetInstance()->RemoveObserver(this);
 }
@@ skipping 44 matching lines @@
       FROM_HERE, base::Bind(&MediaClient::RequestCaptureState,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 MediaCaptureState MediaClient::GetMediaCaptureStateByIndex(int user_index) {
   content::BrowserContext* context =
       ChromeShellContentState::GetInstance()->GetBrowserContextByIndex(
           user_index);
   return GetMediaCaptureStateOfAllWebContents(context);
 }