mash: Fix controller ownership in LauncherContextMenuTest.

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

 // Copyright (c) 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/launcher_context_menu.h"
 
 #include <memory>
 
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/shell_test_api.h"
 #include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
@@ skipping 16 matching lines @@
   static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) {
     return menu->GetIndexOfCommandId(command_id) != -1;
   }
 
   LauncherContextMenuTest() : profile_(new TestingProfile()) {}
 
   void SetUp() override {
     arc_test_.SetUp(profile_.get());
     session_manager_ = base::MakeUnique<session_manager::SessionManager>();
     ash::test::AshTestBase::SetUp();
-    controller_.reset(new ChromeLauncherControllerImpl(
-        profile(), ash::Shell::Get()->shelf_model()));
+    std::unique_ptr<ChromeLauncherControllerImpl> controller =
+        base::MakeUnique<ChromeLauncherControllerImpl>(
+            profile(), ash::Shell::Get()->shelf_model());
+    controller_ = controller.get();
     controller_->Init();
+    ash::test::ShellTestApi().SetShelfDelegate(std::move(controller));
   }
 
   void TearDown() override {
-    controller_.reset(nullptr);
     ash::test::AshTestBase::TearDown();
   }
 
   ash::WmShelf* GetWmShelf(int64_t display_id) {
     ash::RootWindowController* root_window_controller =
         ash::Shell::GetRootWindowControllerWithDisplayId(display_id);
     EXPECT_NE(nullptr, root_window_controller);
     return root_window_controller->GetShelf();
   }
 
   LauncherContextMenu* CreateLauncherContextMenu(
       ash::ShelfItemType shelf_item_type,
       ash::WmShelf* wm_shelf) {
     ash::ShelfItem item;
     item.id = 123;  // dummy id
     item.type = shelf_item_type;
-    return LauncherContextMenu::Create(controller_.get(), &item, wm_shelf);
+    return LauncherContextMenu::Create(controller_, &item, wm_shelf);
   }
 
   LauncherContextMenu* CreateLauncherContextMenuForDesktopShell(
       ash::WmShelf* wm_shelf) {
     ash::ShelfItem* item = nullptr;
-    return LauncherContextMenu::Create(controller_.get(), item, wm_shelf);
+    return LauncherContextMenu::Create(controller_, item, wm_shelf);
   }
 
   // Creates app window and set optional ARC application id.
   views::Widget* CreateArcWindow(std::string& window_app_id) {
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     views::Widget* widget = new views::Widget();
     widget->Init(params);
     widget->Show();
     widget->Activate();
     exo::ShellSurface::SetApplicationId(widget->GetNativeWindow(),
                                         window_app_id);
     return widget;
   }
 
   ArcAppTest& arc_test() { return arc_test_; }
 
   Profile* profile() { return profile_.get(); }
 
-  ChromeLauncherControllerImpl* controller() { return controller_.get(); }
+  ChromeLauncherControllerImpl* controller() { return controller_; }
 
  private:
   std::unique_ptr<TestingProfile> profile_;
-  std::unique_ptr<ChromeLauncherControllerImpl> controller_;
+  ChromeLauncherControllerImpl* controller_ = nullptr;
   ArcAppTest arc_test_;
   std::unique_ptr<session_manager::SessionManager> session_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenuTest);
 };
 
 // Verifies that "New Incognito window" menu item in the launcher context
 // menu is disabled when Incognito mode is switched off (by a policy).
 TEST_F(LauncherContextMenuTest,
        NewIncognitoWindowMenuIsDisabledWhenIncognitoModeOff) {
@@ skipping 189 matching lines @@
   widget->SetFullscreen(true);
   std::unique_ptr<LauncherContextMenu> primary_menu(CreateLauncherContextMenu(
       ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
   std::unique_ptr<LauncherContextMenu> secondary_menu(CreateLauncherContextMenu(
       ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(secondary_id)));
   EXPECT_FALSE(IsItemPresentInMenu(primary_menu.get(),
                                    LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(IsItemPresentInMenu(secondary_menu.get(),
                                   LauncherContextMenu::MENU_AUTO_HIDE));
 }