ash: Remove ShelfModel id conversion functions.

chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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/extension_launcher_context_menu.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/launch_util.h"
@@ skipping 76 matching lines @@
       AddItem(MENU_CLOSE,
               l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
     }
   } else if (item().type == ash::TYPE_DIALOG) {
     AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   } else if (controller()->IsOpen(item().id)) {
     AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   }
   AddSeparator(ui::NORMAL_SEPARATOR);
   if (item().type == ash::TYPE_PINNED_APP || item().type == ash::TYPE_APP) {
-    const extensions::MenuItem::ExtensionKey app_key(
-        controller()->GetAppIDForShelfID(item().id));

[James Cook, 2017/05/10 15:56:34]

Global praise: It's so awesome we don't have to do these lookups all over the
place anymore.

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

I agree!

+    const extensions::MenuItem::ExtensionKey app_key(item().id.app_id);
     if (!app_key.empty()) {
       int index = 0;
       extension_items_->AppendExtensionItems(app_key, base::string16(), &index,
                                              false);  // is_action_menu
       AddSeparator(ui::NORMAL_SEPARATOR);
     }
   }
   AddShelfOptionsMenu();
 }
 
@@ skipping 109 matching lines @@
   if (!extension)
     return extensions::LAUNCH_TYPE_DEFAULT;
 
   return extensions::GetLaunchType(
       extensions::ExtensionPrefs::Get(controller()->profile()), extension);
 }
 
 void ExtensionLauncherContextMenu::SetLaunchType(extensions::LaunchType type) {
   extensions::SetLaunchType(controller()->profile(), item().id.app_id, type);
 }