Use mojo Shelf interfaces for both mash and classic ash.

chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_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/arc_app_deferred_launcher_controller.h"
 
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"
@@ skipping 41 matching lines @@
   const std::string shelf_app_id_;
   const gfx::ImageSkia image_;
 
   DISALLOW_COPY_AND_ASSIGN(SpinningEffectSource);
 };
 }  // namespace
 
 ArcAppDeferredLauncherController::ArcAppDeferredLauncherController(
     ChromeLauncherControllerImpl* owner)
     : owner_(owner), weak_ptr_factory_(this) {
-  if (arc::ArcAuthService::IsAllowedForProfile(owner->GetProfile())) {
-    observed_profile_ = owner->GetProfile();
+  if (arc::ArcAuthService::IsAllowedForProfile(owner->profile())) {
+    observed_profile_ = owner->profile();
     ArcAppListPrefs::Get(observed_profile_)->AddObserver(this);
   }
   arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
   // arc::ArcAuthService might not be set in tests.
   if (auth_service)
     auth_service->AddObserver(this);
 }
 
 ArcAppDeferredLauncherController::~ArcAppDeferredLauncherController() {
   arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
@@ skipping 26 matching lines @@
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   app_controller_map_.erase(shelf_app_id);
 }
 
 void ArcAppDeferredLauncherController::Close(const std::string& app_id) {
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   AppControllerMap::const_iterator it = app_controller_map_.find(shelf_app_id);
   if (it == app_controller_map_.end())
     return;
-
   const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);
   const bool need_close_item =
       it->second == owner_->GetLauncherItemController(shelf_id);
   app_controller_map_.erase(it);
   if (need_close_item)
     owner_->CloseLauncherItem(shelf_id);
-  owner_->OnAppUpdated(owner_->GetProfile(), shelf_app_id);
+  owner_->OnAppUpdated(owner_->profile(), shelf_app_id);
 }
 
 void ArcAppDeferredLauncherController::OnAppReadyChanged(
     const std::string& app_id,
     bool ready) {
   if (!ready || app_controller_map_.empty())
     return;
 
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
@@ skipping 33 matching lines @@
 
   return it->second->GetActiveTime();
 }
 
 void ArcAppDeferredLauncherController::UpdateApps() {
   if (app_controller_map_.empty())
     return;
 
   RegisterNextUpdate();
   for (const auto pair : app_controller_map_)
-    owner_->OnAppUpdated(owner_->GetProfile(), pair.first);
+    owner_->OnAppUpdated(owner_->profile(), pair.first);
 }
 
 void ArcAppDeferredLauncherController::RegisterNextUpdate() {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&ArcAppDeferredLauncherController::UpdateApps,
                             weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kUpdateIconIntervalMs));
 }
 
 void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
@@ skipping 26 matching lines @@
   } else {
     owner_->SetItemController(shelf_id, controller);
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
 
   app_controller_map_[shelf_app_id] = controller;
 }