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

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/ui/ash/launcher/chrome_launcher_controller.h"
 
+#include "ash/public/interfaces/constants.mojom.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
-#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 // static
 ChromeLauncherController* ChromeLauncherController::instance_ = nullptr;
 
@@ skipping 26 matching lines @@
 bool ChromeLauncherController::ConnectToShelfController() {
   if (shelf_controller_.is_bound())
     return true;
 
   auto connection = content::ServiceManagerConnection::GetForProcess();
   auto connector = connection ? connection->GetConnector() : nullptr;
   // Unit tests may not have a connector.
   if (!connector)
     return false;
 
-  connector->BindInterface(ash_util::GetAshServiceName(), &shelf_controller_);
+  connector->BindInterface(ash::mojom::kServiceName, &shelf_controller_);
   return true;
 }
 
 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp(
     const std::string& app_id) {
   for (const auto& app_icon_loader : app_icon_loaders_) {
     if (app_icon_loader->CanLoadImageForApp(app_id))
       return app_icon_loader.get();
   }
 
@@ skipping 111 matching lines @@
   // This will uselessly store a preference value for invalid display ids.
   ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id,
                                               auto_hide);
 }
 
 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id,
                                                  const gfx::ImageSkia& image) {
   // Implemented by subclasses; this should not be called.
   NOTREACHED();
 }