mash: Prerequisites for removing ShelfDelegate.

ash/metrics/user_metrics_recorder_unittest.cc

 // Copyright 2015 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 "ash/metrics/user_metrics_recorder.h"
 
 #include <memory>
 
 #include "ash/login_status.h"
 #include "ash/public/cpp/config.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/test_shelf_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/user_metrics_recorder_test_api.h"
 #include "ash/wm_window.h"
 #include "base/test/histogram_tester.h"
-#include "ui/aura/window.h"
 
 namespace ash {
 namespace {
 
 const char kAsh_NumberOfVisibleWindowsInPrimaryDisplay[] =
     "Ash.NumberOfVisibleWindowsInPrimaryDisplay";
 
 const char kAsh_ActiveWindowShowTypeOverTime[] =
     "Ash.ActiveWindowShowTypeOverTime";
 
@@ skipping 16 matching lines @@
   void SetUp() override;
   void TearDown() override;
 
   // Sets the user login status.
   void SetLoginStatus(LoginStatus login_status);
 
   // Sets the current user session to be active or inactive in a desktop
   // environment.
   void SetUserInActiveDesktopEnvironment(bool is_active);
 
-  // Creates an aura::Window.
-  aura::Window* CreateTestWindow();
-
   test::UserMetricsRecorderTestAPI* user_metrics_recorder_test_api() {
     return user_metrics_recorder_test_api_.get();
   }
 
   base::HistogramTester& histograms() { return histograms_; }
 
  private:
   // Test API to access private members of the test target.
   std::unique_ptr<test::UserMetricsRecorderTestAPI>
       user_metrics_recorder_test_api_;
@@ skipping 32 matching lines @@
     SetLoginStatus(LoginStatus::USER);
     ASSERT_TRUE(
         user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment());
   } else {
     SetLoginStatus(LoginStatus::LOCKED);
     ASSERT_FALSE(
         user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment());
   }
 }
 
-aura::Window* UserMetricsRecorderTest::CreateTestWindow() {
-  aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
-      nullptr, ui::wm::WINDOW_TYPE_NORMAL, 0, gfx::Rect());
-  return window;
-}
-
 // Verifies the return value of IsUserInActiveDesktopEnvironment() for the
 // different login status values.
 TEST_F(UserMetricsRecorderTest, VerifyIsUserInActiveDesktopEnvironmentValues) {
   SetLoginStatus(LoginStatus::NOT_LOGGED_IN);
   EXPECT_FALSE(
       user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment());
 
   SetLoginStatus(LoginStatus::LOCKED);
   EXPECT_FALSE(
       user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment());
@@ skipping 58 matching lines @@
   histograms().ExpectTotalCount(kAsh_ActiveWindowShowTypeOverTime, 1);
 }
 
 // Verify the shelf item counts recorded by the
 // UserMetricsRecorder::RecordPeriodicMetrics() method.
 TEST_F(UserMetricsRecorderTest, ValuesRecordedByRecordShelfItemCounts) {
   // TODO: investigate failure in mash, http://crbug.com/695629.
   if (Shell::GetAshConfig() == Config::MASH)
     return;
 
-  test::TestShelfDelegate* test_shelf_delegate =
-      test::TestShelfDelegate::instance();
   SetUserInActiveDesktopEnvironment(true);
 
   // Make sure the shelf contains the app list launcher button.
-  const ShelfItems& shelf_items = Shell::Get()->shelf_model()->items();
-  ASSERT_EQ(1u, shelf_items.size());
-  ASSERT_EQ(TYPE_APP_LIST, shelf_items[0].type);
+  ShelfModel* shelf_model = Shell::Get()->shelf_model();
+  ASSERT_EQ(1u, shelf_model->items().size());
+  ASSERT_EQ(TYPE_APP_LIST, shelf_model->items()[0].type);
 
-  aura::Window* pinned_window_with_app_id_1 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_1),
-                                    "app_id_1");
-  test_shelf_delegate->PinAppWithID("app_id_1");
+  ShelfItem shelf_item;
+  shelf_item.type = ash::TYPE_PINNED_APP;
+  shelf_item.app_launch_id = AppLaunchId("app_id_1");
+  shelf_model->Add(shelf_item);
+  shelf_item.app_launch_id = AppLaunchId("app_id_2");
+  shelf_model->Add(shelf_item);
 
-  aura::Window* pinned_window_with_app_id_2 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_2),
-                                    "app_id_2");
-  test_shelf_delegate->PinAppWithID("app_id_2");
-
-  aura::Window* unpinned_window_with_app_id_3 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(
-      WmWindow::Get(unpinned_window_with_app_id_3), "app_id_3");
-
-  aura::Window* unpinned_window_4 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_4));
-
-  aura::Window* unpinned_window_5 = CreateTestWindow();
-  test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_5));
+  shelf_item.type = ash::TYPE_APP;
+  shelf_item.app_launch_id = AppLaunchId("app_id_3");
+  shelf_model->Add(shelf_item);
+  shelf_item.app_launch_id = AppLaunchId("app_id_4");
+  shelf_model->Add(shelf_item);
+  shelf_item.app_launch_id = AppLaunchId("app_id_5");
+  shelf_model->Add(shelf_item);
 
   user_metrics_recorder_test_api()->RecordPeriodicMetrics();
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfItems, 5, 1);
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfPinnedItems, 2, 1);
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfUnpinnedItems, 3, 1);
 }
 
 }  // namespace ash