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

mash/package/mash_packaged_service.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 "mash/package/mash_packaged_service.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/memory/ptr_util.h"
 #include "base/process/process.h"
 #include "mash/catalog_viewer/catalog_viewer.h"
 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h"
 #include "mash/quick_launch/public/interfaces/constants.mojom.h"
 #include "mash/quick_launch/quick_launch.h"
 #include "mash/session/public/interfaces/constants.mojom.h"
 #include "mash/session/session.h"
 #include "mash/task_viewer/public/interfaces/constants.mojom.h"
 #include "mash/task_viewer/task_viewer.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/ime/test_ime_driver/test_ime_application.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/service.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/autoclick/mus/autoclick_application.h"  // nogncheck
 #include "ash/mus/window_manager_application.h"  // nogncheck
+#include "ash/public/interfaces/constants.mojom.h"    // nogncheck
 #include "ash/touch_hud/mus/touch_hud_application.h"  // nogncheck
 #endif
 
 #if defined(OS_LINUX)
 #include "components/font_service/font_service_app.h"
 #endif
 
 namespace mash {
 
 MashPackagedService::MashPackagedService() {}
@@ skipping 38 matching lines @@
           switches::kWaitForDebugger);
   if (!debugger_target.empty()) {
     if (name == debugger_target) {
       LOG(WARNING) << "waiting for debugger to attach for service " << name
                    << " pid=" << base::Process::Current().Pid();
       base::debug::WaitForDebugger(120, true);
     }
   }
 
 #if defined(OS_CHROMEOS)
-  if (name == "ash")
+  if (name == ash::mojom::kServiceName)
     return base::WrapUnique(new ash::mus::WindowManagerApplication);
   if (name == "accessibility_autoclick")
     return base::WrapUnique(new ash::autoclick::AutoclickApplication);
   if (name == "touch_hud")
     return base::WrapUnique(new ash::touch_hud::TouchHudApplication);
 #endif
   if (name == catalog_viewer::mojom::kServiceName)
     return base::WrapUnique(new mash::catalog_viewer::CatalogViewer);
   if (name == session::mojom::kServiceName)
     return base::WrapUnique(new mash::session::Session);
   if (name == ui::mojom::kServiceName)
     return base::WrapUnique(new ui::Service);
   if (name == quick_launch::mojom::kServiceName)
     return base::WrapUnique(new mash::quick_launch::QuickLaunch);
   if (name == task_viewer::mojom::kServiceName)
     return base::WrapUnique(new mash::task_viewer::TaskViewer);
   if (name == "test_ime_driver")
     return base::WrapUnique(new ui::test::TestIMEApplication);
 #if defined(OS_LINUX)
   if (name == "font_service")
     return base::WrapUnique(new font_service::FontServiceApp);
 #endif
   return nullptr;
 }
 
 }  // namespace mash