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

chrome/browser/ui/ash/ash_util.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/ash_util.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/mojo_interface_factory.h"
 #include "ash/common/wm_shell.h"
 #include "base/macros.h"
@@ skipping 31 matching lines @@
 
  private:
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   service_manager::InterfaceRegistry interfaces_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedAshService);
 };
 
 }  // namespace
 
-// TODO(rockot): Remove this.
-const char* GetAshServiceName() {
-  return "ash";
-}
-
 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   return base::MakeUnique<EmbeddedAshService>(task_runner);
 }
 
 }  // namespace ash_util
 
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
   return !IsRunningInMash();
 }
 
 bool IsRunningInMash() {
   return service_manager::ServiceManagerIsRemote();
 }
 
 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
   // When running in mash the browser doesn't handle ash accelerators.
   if (chrome::IsRunningInMash())
     return false;
 
   return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(
       accelerator);
 }
 
 }  // namespace chrome