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

chrome/browser/ui/ash/volume_controller.cc

 // Copyright (c) 2012 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/volume_controller.h"
 
 #include "ash/public/interfaces/accelerator_controller.mojom.h"
+#include "ash/public/interfaces/constants.mojom.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/grit/browser_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/common/service_manager_connection.h"
 #include "media/audio/sounds/sounds_manager.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
@@ skipping 14 matching lines @@
   }
 }
 
 }  // namespace
 
 VolumeController::VolumeController() : binding_(this) {
   // Connect to the accelerator controller interface in the ash service.
   service_manager::Connector* connector =
       content::ServiceManagerConnection::GetForProcess()->GetConnector();
   ash::mojom::AcceleratorControllerPtr accelerator_controller_ptr;
-  connector->BindInterface(ash_util::GetAshServiceName(),
+  connector->BindInterface(ash::mojom::kServiceName,
                            &accelerator_controller_ptr);
 
   // Register this object as the volume controller.
   accelerator_controller_ptr->SetVolumeController(
       binding_.CreateInterfacePtrAndBind());
 
   if (VolumeAdjustSoundEnabled()) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     media::SoundsManager::Get()->Initialize(
         chromeos::SOUND_VOLUME_ADJUST,
@@ skipping 28 matching lines @@
     audio_handler->AdjustOutputVolumeToAudibleLevel();
     play_sound = true;
   } else {
     play_sound = audio_handler->GetOutputVolumePercent() != 100;
     audio_handler->AdjustOutputVolumeByPercent(kStepPercentage);
   }
 
   if (play_sound)
     PlayVolumeAdjustSound();
 }