arc: Support pinned apps across Arc-enabled and Arc-disabled platforms.

chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index 9d67fb81fc1e9b5eddff8d355e0f216da4e62eea..1c65499ec282c84883dc1ca649888128ccd7377f 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
-#include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -36,7 +36,10 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
   void SetUp() override {
     arc_test_.SetUp(profile_.get());
     ash::test::AshTestBase::SetUp();
-    controller_.reset(new ChromeLauncherController(profile(), &shelf_model_));
+
+    controller_.reset(new ChromeLauncherController(
+        profile(), ash::Shell::GetInstance()->shelf_model()));
+    controller_->Init();
   }
 
   void TearDown() override {
@@ -72,7 +75,6 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
 
  private:
   std::unique_ptr<TestingProfile> profile_;
-  ash::ShelfModel shelf_model_;
   std::unique_ptr<ChromeLauncherController> controller_;
   ArcAppTest arc_test_;