Rename a bunch of Mojo Application stuff to reference Services.

chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.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 "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
 
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/grit/theme_resources.h"
-#include "content/public/common/mojo_shell_connection.h"
+#include "content/public/common/service_manager_connection.h"
 #include "extensions/common/constants.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate {
  public:
@@ skipping 38 matching lines @@
 }
 
 ChromeMashShelfController::~ChromeMashShelfController() {}
 
 void ChromeMashShelfController::LaunchItem(const std::string& app_id) {
   helper_.LaunchApp(app_id, ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
 }
 
 void ChromeMashShelfController::Init() {
   shell::Connector* connector =
-      content::MojoShellConnection::GetForProcess()->GetConnector();
+      content::ServiceManagerConnection::GetForProcess()->GetConnector();
   connector->ConnectToInterface("service:ash", &shelf_controller_);
 
   // Initialize shelf alignment and auto-hide behavior from preferences.
   for (const auto& display : display::Screen::GetScreen()->GetAllDisplays())
     OnShelfCreated(display.id());
 
   // TODO(skuhne): The AppIconLoaderImpl has the same problem. Each loaded
   // image is associated with a profile (its loader requires the profile).
   // Since icon size changes are possible, the icon could be requested to be
   // reloaded. However - having it not multi profile aware would cause problems
@@ skipping 88 matching lines @@
   // This will uselessly store a preference value for invalid display ids.
   ash::launcher::SetShelfAutoHideBehaviorPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(), display_id,
       auto_hide);
 }
 
 void ChromeMashShelfController::OnAppImageUpdated(const std::string& app_id,
                                                   const gfx::ImageSkia& image) {
   shelf_controller_->SetItemImage(app_id, *image.bitmap());
 }