Pass shelf instances, not root windows, for ash context menus.

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 "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/macros.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/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
 #include "ui/aura/window_event_dispatcher.h"
 
-class TestChromeLauncherController : public ChromeLauncherController {
- public:
-  TestChromeLauncherController(Profile* profile, ash::ShelfModel* model)
-      : ChromeLauncherController(profile, model) {}
-  bool IsLoggedInAsGuest() override { return false; }
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherController);
-};
-
 class LauncherContextMenuTest : public ash::test::AshTestBase {
  protected:
   static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) {
-    DCHECK(menu);
     return menu->GetIndexOfCommandId(command_id) != -1;
   }
 
-  LauncherContextMenuTest()
-      : profile_(new TestingProfile()) {}
+  LauncherContextMenuTest() : profile_(new TestingProfile()) {}
 
   void SetUp() override {
     ash::test::AshTestBase::SetUp();
-    controller_.reset(
-        new TestChromeLauncherController(profile(), &shelf_model_));
+    controller_.reset(new ChromeLauncherController(profile(), &shelf_model_));
   }
 
   void TearDown() override {
-    controller_.reset(NULL);
+    controller_.reset(nullptr);
     ash::test::AshTestBase::TearDown();
   }
 
   LauncherContextMenu* CreateLauncherContextMenu(
       ash::ShelfItemType shelf_item_type) {
     ash::ShelfItem item;
     item.id = 1;  // dummy id
     item.type = shelf_item_type;
-    return new LauncherContextMenu(controller_.get(), &item, CurrentContext());
+    ash::Shelf* shelf = ash::Shelf::ForWindow(CurrentContext());
+    return new LauncherContextMenu(controller_.get(), &item, shelf);
   }
 
   Profile* profile() { return profile_.get(); }
 
  private:
   scoped_ptr<TestingProfile> profile_;
   ash::ShelfModel shelf_model_;
   scoped_ptr<ChromeLauncherController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenuTest);
@@ skipping 34 matching lines @@
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));
 
   // Disable Incognito mode.
   IncognitoModePrefs::SetAvailability(profile()->GetPrefs(),
                                       IncognitoModePrefs::FORCED);
   menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));
   ASSERT_TRUE(IsItemPresentInMenu(
       menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));
   EXPECT_FALSE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));
 }