ash: Remove ShelfModel id conversion functions.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 <stddef.h>
 
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 1517 matching lines @@
   params.window_type = AppWindow::WINDOW_TYPE_PANEL;
   params.focused = false;
   AppWindow* panel =
       CreateAppWindowFromParams(browser()->profile(), extension, params);
   EXPECT_TRUE(panel->GetNativeWindow()->IsVisible());
   // Panels should not be active by default.
   EXPECT_FALSE(panel->GetBaseWindow()->IsActive());
   // Confirm that a shelf item was created and is the correct state.
   const ash::ShelfItem& item = GetLastLauncherPanelItem();
   ash::ShelfItemDelegate* shelf_item_delegate = GetShelfItemDelegate(item.id);
-  EXPECT_NE(nullptr, shelf_item_delegate);
+  EXPECT_TRUE(shelf_item_delegate);
   EXPECT_EQ(ash::TYPE_APP_PANEL, item.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item.status);
 
   // App windows should go to attention state.
   panel->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, item.status);
 
   // Click the item and confirm that the panel is activated.
   EXPECT_EQ(ash::SHELF_ACTION_WINDOW_ACTIVATED,
             SelectItem(shelf_item_delegate, ui::ET_MOUSE_PRESSED));
@@ skipping 672 matching lines @@
 
   test.RunMessageLoopUntilAnimationsDone();
   EXPECT_FALSE(shelf_->shelf_widget()->IsShowingOverflowBubble());
 }
 
 // Check that a windowed V1 application can navigate away from its domain, but
 // still gets detected properly.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {
   // We assume that the web store is always there (which it apparently is).
   controller_->PinAppWithID(extensions::kWebStoreAppId);
-  ash::ShelfID id = controller_->GetShelfIDForAppID(extensions::kWebStoreAppId);
-  EXPECT_FALSE(id.IsNull());
+  const ash::ShelfID id(extensions::kWebStoreAppId);
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(id)->status);
 
   // Create a windowed application.
   AppLaunchParams params = CreateAppLaunchParamsUserContainer(
       profile(), GetExtensionForAppID(extensions::kWebStoreAppId, profile()),
       WindowOpenDisposition::NEW_FOREGROUND_TAB, extensions::SOURCE_TEST);
   params.container = extensions::LAUNCH_CONTAINER_WINDOW;
   OpenApplication(params);
   EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);
 
@@ skipping 57 matching lines @@
   // crbug.com/230464.
 }
 
 // Check that tabbed hosted and bookmark apps have correct shelf presence.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, TabbedHostedAndBookmarkApps) {
   // Load and pin a hosted app.
   const Extension* hosted_app =
       LoadExtension(test_data_dir_.AppendASCII("app1/"));
   ASSERT_TRUE(hosted_app);
   controller_->PinAppWithID(hosted_app->id());
-  const ash::ShelfID hosted_app_shelf_id =
-      controller_->GetShelfIDForAppID(hosted_app->id());
+  const ash::ShelfID hosted_app_shelf_id(hosted_app->id());
 
   // Load and pin a bookmark app.
   const Extension* bookmark_app = InstallExtensionWithSourceAndFlags(
       test_data_dir_.AppendASCII("app2/"), 1, extensions::Manifest::INTERNAL,
       extensions::Extension::FROM_BOOKMARK);
   ASSERT_TRUE(bookmark_app);
   controller_->PinAppWithID(bookmark_app->id());
-  const ash::ShelfID bookmark_app_shelf_id =
-      controller_->GetShelfIDForAppID(bookmark_app->id());
+  const ash::ShelfID bookmark_app_shelf_id(bookmark_app->id());
 
   // The apps should be closed.
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_CLOSED,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 
   // Navigate to the app's launch URLs in two tabs.
   ui_test_utils::NavigateToURL(
       browser(), extensions::AppLaunchInfo::GetLaunchWebURL(hosted_app));
   ui_test_utils::NavigateToURLWithDisposition(
@@ skipping 14 matching lines @@
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 }
 
 // Check that windowed hosted and bookmark apps have correct shelf presence.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, WindowedHostedAndBookmarkApps) {
   // Load and pin a hosted app.
   const Extension* hosted_app =
       LoadExtension(test_data_dir_.AppendASCII("app1/"));
   ASSERT_TRUE(hosted_app);
   controller_->PinAppWithID(hosted_app->id());
-  const ash::ShelfID hosted_app_shelf_id =
-      controller_->GetShelfIDForAppID(hosted_app->id());
+  const ash::ShelfID hosted_app_shelf_id(hosted_app->id());
 
   // Load and pin a bookmark app.
   const Extension* bookmark_app = InstallExtensionWithSourceAndFlags(
       test_data_dir_.AppendASCII("app2/"), 1, extensions::Manifest::INTERNAL,
       extensions::Extension::FROM_BOOKMARK);
   ASSERT_TRUE(bookmark_app);
   controller_->PinAppWithID(bookmark_app->id());
-  const ash::ShelfID bookmark_app_shelf_id =
-      controller_->GetShelfIDForAppID(bookmark_app->id());
+  const ash::ShelfID bookmark_app_shelf_id(bookmark_app->id());
 
   // Set both apps to open in windows.
   extensions::SetLaunchType(browser()->profile(), hosted_app->id(),
                             extensions::LAUNCH_TYPE_WINDOW);
   extensions::SetLaunchType(browser()->profile(), bookmark_app->id(),
                             extensions::LAUNCH_TYPE_WINDOW);
 
   // The apps should be closed.
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_CLOSED,
@@ skipping 36 matching lines @@
 
   // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
   std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }