ash: Remove ShelfModel id conversion functions.

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 "ash/shelf/shelf_model.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
@@ skipping 93 matching lines @@
   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 ash::ShelfID shelf_id(shelf_app_id);
   const bool need_close_item =
       it->second == owner_->shelf_model()->GetShelfItemDelegate(shelf_id);
   app_controller_map_.erase(it);
   if (need_close_item)
     owner_->CloseLauncherItem(shelf_id);
   owner_->OnAppUpdated(owner_->profile(), shelf_app_id);
 }
 
 void ArcAppDeferredLauncherController::OnAppReadyChanged(
     const std::string& app_id,
@@ skipping 65 matching lines @@
   const arc::ArcSessionManager* arc_session_manager =
       arc::ArcSessionManager::Get();
   DCHECK(arc_session_manager);
   DCHECK(arc_session_manager->state() !=
          arc::ArcSessionManager::State::STOPPED);
   DCHECK(arc_session_manager->state() !=
          arc::ArcSessionManager::State::NOT_INITIALIZED);
 
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
-  const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);
+  const ash::ShelfID shelf_id(shelf_app_id);
 
   // We are allowed to apply new deferred controller only over non-active items.
   const ash::ShelfItem* item = owner_->GetItem(shelf_id);
   if (item && item->status != ash::STATUS_CLOSED)
     return;
 
   std::unique_ptr<ArcAppDeferredLauncherItemController> controller =
       base::MakeUnique<ArcAppDeferredLauncherItemController>(
           shelf_app_id, event_flags, weak_ptr_factory_.GetWeakPtr());
-  ArcAppDeferredLauncherItemController* item_controller = controller.get();
-  if (shelf_id.IsNull()) {
+  app_controller_map_[shelf_app_id] = controller.get();

[James Cook, 2017/05/10 02:51:18]

Is it safe to move this up? Won't that mean the if () on line 219 won't ever
execute?  Does any of the code between here and there touch app_controller_map_?

[msw, 2017/05/10 18:21:53]

Good catch, I reverted this part of the change. This is a good reminder to not
get cavalier with refactoring changes.

+  if (item == nullptr) {
     owner_->CreateAppLauncherItem(std::move(controller), ash::STATUS_RUNNING);
   } else {
     owner_->shelf_model()->SetShelfItemDelegate(shelf_id,
                                                 std::move(controller));
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
-
-  app_controller_map_[shelf_app_id] = item_controller;
 }