mash: Move ShelfModel* to ash/public/cpp.

ash/shelf/shelf_model_unittest.cc

Index: ash/shelf/shelf_model_unittest.cc
diff --git a/ash/shelf/shelf_model_unittest.cc b/ash/shelf/shelf_model_unittest.cc
deleted file mode 100644
index e731c8cc83d5c38a7bd7dd47fd79174a674a118d..0000000000000000000000000000000000000000
--- a/ash/shelf/shelf_model_unittest.cc
+++ /dev/null
@@ -1,432 +0,0 @@
-// 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 "ash/shelf/shelf_model.h"
-
-#include <set>
-#include <string>
-
-#include "ash/shelf/shelf_model_observer.h"
-#include "base/strings/stringprintf.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace ash {
-
-namespace {
-
-// ShelfModelObserver implementation that tracks what message are invoked.
-class TestShelfModelObserver : public ShelfModelObserver {
- public:
-  TestShelfModelObserver() {}
-
-  // Returns a string description of the changes that have occurred since this
-  // was last invoked. Resets state to initial state.
-  std::string StateStringAndClear() {
-    std::string result;
-    AddToResult("added=%d", added_count_, &result);
-    AddToResult("removed=%d", removed_count_, &result);
-    AddToResult("changed=%d", changed_count_, &result);
-    AddToResult("moved=%d", moved_count_, &result);
-    added_count_ = removed_count_ = changed_count_ = moved_count_ = 0;
-    return result;
-  }
-
-  // ShelfModelObserver overrides:
-  void ShelfItemAdded(int) override { added_count_++; }
-  void ShelfItemRemoved(int, const ShelfItem&) override { removed_count_++; }
-  void ShelfItemChanged(int, const ShelfItem&) override { changed_count_++; }
-  void ShelfItemMoved(int, int) override { moved_count_++; }
-  void ShelfItemDelegateChanged(const ShelfID&, ShelfItemDelegate*) override {}
-
- private:
-  void AddToResult(const std::string& format, int count, std::string* result) {
-    if (!count)
-      return;
-    if (!result->empty())
-      *result += " ";
-    *result += base::StringPrintf(format.c_str(), count);
-  }
-
-  int added_count_ = 0;
-  int removed_count_ = 0;
-  int changed_count_ = 0;
-  int moved_count_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(TestShelfModelObserver);
-};
-
-}  // namespace
-
-class ShelfModelTest : public testing::Test {
- public:
-  ShelfModelTest() {}
-  ~ShelfModelTest() override {}
-
-  void SetUp() override {
-    model_.reset(new ShelfModel);
-    observer_.reset(new TestShelfModelObserver);
-    model_->AddObserver(observer_.get());
-  }
-
-  void TearDown() override {
-    observer_.reset();
-    model_.reset();
-  }
-
-  std::unique_ptr<ShelfModel> model_;
-  std::unique_ptr<TestShelfModelObserver> observer_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ShelfModelTest);
-};
-
-TEST_F(ShelfModelTest, IntializesAppListItem) {
-  EXPECT_EQ(1, model_->item_count());
-  EXPECT_EQ(kAppListId, model_->items()[0].id.app_id);
-  // The ShelfModel does not initialize the AppList's ShelfItemDelegate.
-  // ShelfController does that to prevent Chrome from creating its own delegate.
-  EXPECT_FALSE(model_->GetShelfItemDelegate(ShelfID(kAppListId)));
-}
-
-TEST_F(ShelfModelTest, BasicAssertions) {
-  // Add an item.
-  ShelfItem item1;
-  item1.id = ShelfID("item1");
-  item1.type = TYPE_PINNED_APP;
-  int index = model_->Add(item1);
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_LE(0, model_->ItemIndexByID(item1.id));
-  EXPECT_NE(model_->items().end(), model_->ItemByID(item1.id));
-  EXPECT_EQ("added=1", observer_->StateStringAndClear());
-
-  // Change to a platform app item.
-  item1.type = TYPE_APP;
-  model_->Set(index, item1);
-  EXPECT_EQ(item1.id, model_->items()[index].id);
-  EXPECT_LE(0, model_->ItemIndexByID(item1.id));
-  EXPECT_NE(model_->items().end(), model_->ItemByID(item1.id));
-  EXPECT_EQ("changed=1", observer_->StateStringAndClear());
-  EXPECT_EQ(TYPE_APP, model_->items()[index].type);
-
-  // Remove the item.
-  model_->RemoveItemAt(index);
-  EXPECT_EQ(1, model_->item_count());
-  EXPECT_EQ(-1, model_->ItemIndexByID(item1.id));
-  EXPECT_EQ(model_->items().end(), model_->ItemByID(item1.id));
-  EXPECT_EQ("removed=1", observer_->StateStringAndClear());
-
-  // Add an app item.
-  ShelfItem item2;
-  item2.id = ShelfID("item2");
-  item2.type = TYPE_PINNED_APP;
-  index = model_->Add(item2);
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_LE(0, model_->ItemIndexByID(item2.id));
-  EXPECT_NE(model_->items().end(), model_->ItemByID(item2.id));
-  EXPECT_EQ("added=1", observer_->StateStringAndClear());
-
-  // Change the item type.
-  item2.type = TYPE_APP;
-  model_->Set(index, item2);
-  EXPECT_LE(0, model_->ItemIndexByID(item2.id));
-  EXPECT_NE(model_->items().end(), model_->ItemByID(item2.id));
-  EXPECT_EQ("changed=1", observer_->StateStringAndClear());
-  EXPECT_EQ(TYPE_APP, model_->items()[index].type);
-
-  // Add another item.
-  ShelfItem item3;
-  item3.id = ShelfID("item3");
-  item3.type = TYPE_PINNED_APP;
-  model_->Add(item3);
-  EXPECT_EQ(3, model_->item_count());
-  EXPECT_LE(0, model_->ItemIndexByID(item3.id));
-  EXPECT_NE(model_->items().end(), model_->ItemByID(item3.id));
-  EXPECT_EQ("added=1", observer_->StateStringAndClear());
-
-  // Move the second to the first.
-  model_->Move(1, 0);
-  EXPECT_EQ("moved=1", observer_->StateStringAndClear());
-
-  // And back.
-  model_->Move(0, 1);
-  EXPECT_EQ("moved=1", observer_->StateStringAndClear());
-
-  // Verifies all the items get unique ids.
-  std::set<ShelfID> ids;
-  for (int i = 0; i < model_->item_count(); ++i)
-    ids.insert(model_->items()[i].id);
-  EXPECT_EQ(model_->item_count(), static_cast<int>(ids.size()));
-}
-
-// Assertions around where items are added.
-TEST_F(ShelfModelTest, AddIndices) {
-  // Insert browser short cut at index 1.
-  ShelfItem browser_shortcut;
-  browser_shortcut.id = ShelfID("browser");
-  browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
-  int browser_shortcut_index = model_->Add(browser_shortcut);
-  EXPECT_EQ(1, browser_shortcut_index);
-
-  // App items should be after the browser shortcut.
-  ShelfItem item;
-  item.type = TYPE_APP;
-  item.id = ShelfID("id1");
-  int platform_app_index1 = model_->Add(item);
-  EXPECT_EQ(2, platform_app_index1);
-
-  // Add another platform app item, it should follow first.
-  item.id = ShelfID("id2");
-  int platform_app_index2 = model_->Add(item);
-  EXPECT_EQ(3, platform_app_index2);
-
-  // TYPE_PINNED_APP priority is higher than TYPE_APP but same as
-  // TYPE_BROWSER_SHORTCUT. So TYPE_PINNED_APP is located after
-  // TYPE_BROWSER_SHORTCUT.
-  item.type = TYPE_PINNED_APP;
-  item.id = ShelfID("id3");
-  int app_shortcut_index1 = model_->Add(item);
-  EXPECT_EQ(2, app_shortcut_index1);
-
-  item.type = TYPE_PINNED_APP;
-  item.id = ShelfID("id4");
-  int app_shortcut_index2 = model_->Add(item);
-  EXPECT_EQ(3, app_shortcut_index2);
-
-  // Check that AddAt() figures out the correct indexes for app shortcuts.
-  // TYPE_PINNED_APP and TYPE_BROWSER_SHORTCUT has the same weight.
-  // So TYPE_PINNED_APP is located at index 0. And, TYPE_BROWSER_SHORTCUT is
-  // located at index 1.
-  item.type = TYPE_PINNED_APP;
-  item.id = ShelfID("id5");
-  int app_shortcut_index3 = model_->AddAt(1, item);
-  EXPECT_EQ(1, app_shortcut_index3);
-
-  item.type = TYPE_PINNED_APP;
-  item.id = ShelfID("id6");
-  int app_shortcut_index4 = model_->AddAt(6, item);
-  EXPECT_EQ(5, app_shortcut_index4);
-
-  item.type = TYPE_PINNED_APP;
-  item.id = ShelfID("id7");
-  int app_shortcut_index5 = model_->AddAt(3, item);
-  EXPECT_EQ(3, app_shortcut_index5);
-
-  // Before there are any panels, no icons should be right aligned.
-  EXPECT_EQ(model_->item_count(), model_->FirstPanelIndex());
-
-  // Check that AddAt() figures out the correct indexes for apps and panels.
-  item.type = TYPE_APP;
-  item.id = ShelfID("id8");
-  int platform_app_index3 = model_->AddAt(3, item);
-  EXPECT_EQ(7, platform_app_index3);
-
-  item.type = TYPE_APP_PANEL;
-  item.id = ShelfID("id9");
-  int app_panel_index1 = model_->AddAt(2, item);
-  EXPECT_EQ(10, app_panel_index1);
-
-  item.type = TYPE_APP;
-  item.id = ShelfID("id10");
-  int platform_app_index4 = model_->AddAt(11, item);
-  EXPECT_EQ(10, platform_app_index4);
-
-  item.type = TYPE_APP_PANEL;
-  item.id = ShelfID("id11");
-  int app_panel_index2 = model_->AddAt(12, item);
-  EXPECT_EQ(12, app_panel_index2);
-
-  item.type = TYPE_APP;
-  item.id = ShelfID("id12");
-  int platform_app_index5 = model_->AddAt(7, item);
-  EXPECT_EQ(7, platform_app_index5);
-
-  item.type = TYPE_APP_PANEL;
-  item.id = ShelfID("id13");
-  int app_panel_index3 = model_->AddAt(13, item);
-  EXPECT_EQ(13, app_panel_index3);
-
-  // Right aligned index should be the first app panel index.
-  EXPECT_EQ(12, model_->FirstPanelIndex());
-
-  EXPECT_EQ(TYPE_BROWSER_SHORTCUT, model_->items()[2].type);
-  EXPECT_EQ(TYPE_APP_LIST, model_->items()[0].type);
-}
-
-// Test that the indexes for the running applications are properly determined.
-TEST_F(ShelfModelTest, FirstRunningAppIndex) {
-  // Insert the browser shortcut at index 1 and check that the running
-  // application index would be behind it.
-  ShelfItem item;
-  item.id = ShelfID("browser");
-  item.type = TYPE_BROWSER_SHORTCUT;
-  EXPECT_EQ(1, model_->Add(item));
-  EXPECT_EQ(2, model_->FirstRunningAppIndex());
-
-  // Insert a panel application at the end and check that the running
-  // application index would be at / before the application panel.
-  item.type = TYPE_APP_PANEL;
-  item.id = ShelfID("app panel");
-  EXPECT_EQ(2, model_->Add(item));
-  EXPECT_EQ(2, model_->FirstRunningAppIndex());
-
-  // Insert an application shortcut and make sure that the running application
-  // index would be behind it.
-  item.type = TYPE_PINNED_APP;
-  item.id = ShelfID("pinned app");
-  EXPECT_EQ(2, model_->Add(item));
-  EXPECT_EQ(3, model_->FirstRunningAppIndex());
-
-  // Insert a two app items and check the first running app index.
-  item.type = TYPE_APP;
-  item.id = ShelfID("app1");
-  EXPECT_EQ(3, model_->Add(item));
-  EXPECT_EQ(3, model_->FirstRunningAppIndex());
-  item.id = ShelfID("app2");
-  EXPECT_EQ(4, model_->Add(item));
-  EXPECT_EQ(3, model_->FirstRunningAppIndex());
-}
-
-// Test item reordering on type/weight (eg. pinning) changes. crbug.com/248769.
-TEST_F(ShelfModelTest, ReorderOnTypeChanges) {
-  EXPECT_EQ(TYPE_APP_LIST, model_->items()[0].type);
-
-  // Add three pinned items.
-  ShelfItem item1;
-  item1.type = TYPE_PINNED_APP;
-  item1.id = ShelfID("id1");
-  int app1_index = model_->Add(item1);
-  EXPECT_EQ(1, app1_index);
-
-  ShelfItem item2;
-  item2.type = TYPE_PINNED_APP;
-  item2.id = ShelfID("id2");
-  int app2_index = model_->Add(item2);
-  EXPECT_EQ(2, app2_index);
-
-  ShelfItem item3;
-  item3.type = TYPE_PINNED_APP;
-  item3.id = ShelfID("id3");
-  int app3_index = model_->Add(item3);
-  EXPECT_EQ(3, app3_index);
-
-  // Unpinning an item moves it behind the shortcuts.
-  EXPECT_EQ(item3.id, model_->items()[3].id);
-  item2.type = TYPE_APP;
-  model_->Set(app2_index, item2);
-  EXPECT_EQ(item2.id, model_->items()[3].id);
-}
-
-// Test getting the index of ShelfIDs as a check for item presence.
-TEST_F(ShelfModelTest, ItemIndexByID) {
-  // Expect empty and unknown ids to return the invalid index -1.
-  EXPECT_EQ(-1, model_->ItemIndexByID(ShelfID()));
-  EXPECT_EQ(-1, model_->ItemIndexByID(ShelfID("foo")));
-  EXPECT_EQ(-1, model_->ItemIndexByID(ShelfID("foo", "bar")));
-
-  // Add an item and expect to get a valid index for its id.
-  ShelfItem item1;
-  item1.type = TYPE_PINNED_APP;
-  item1.id = ShelfID("app_id1", "launch_id1");
-  const int index1 = model_->Add(item1);
-  EXPECT_EQ(index1, model_->ItemIndexByID(item1.id));
-
-  // Add another item and expect to get another valid index for its id.
-  ShelfItem item2;
-  item2.type = TYPE_APP;
-  item2.id = ShelfID("app_id2", "launch_id2");
-  const int index2 = model_->Add(item2);
-  EXPECT_EQ(index2, model_->ItemIndexByID(item2.id));
-
-  // Removing the first item should yield an invalid index for that item.
-  model_->RemoveItemAt(index1);
-  EXPECT_EQ(-1, model_->ItemIndexByID(item1.id));
-  // The index of the second item should be decremented, but still valid.
-  EXPECT_EQ(index2 - 1, model_->ItemIndexByID(item2.id));
-  EXPECT_LE(0, model_->ItemIndexByID(item2.id));
-}
-
-// Test pinning and unpinning a closed app, and checking if it is pinned.
-TEST_F(ShelfModelTest, ClosedAppPinning) {
-  const std::string app_id("app_id");
-
-  // Check the initial state.
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(1, model_->item_count());
-
-  // Pinning a previously unknown app should add an item.
-  model_->PinAppWithID(app_id);
-  EXPECT_TRUE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_PINNED_APP, model_->items()[1].type);
-  EXPECT_EQ(app_id, model_->items()[1].id.app_id);
-
-  // Pinning the same app id again should have no change.
-  model_->PinAppWithID(app_id);
-  EXPECT_TRUE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_PINNED_APP, model_->items()[1].type);
-  EXPECT_EQ(app_id, model_->items()[1].id.app_id);
-
-  // Unpinning the app should remove the item.
-  model_->UnpinAppWithID(app_id);
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(1, model_->item_count());
-
-  // Unpinning the same app id again should have no change.
-  model_->UnpinAppWithID(app_id);
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(1, model_->item_count());
-}
-
-// Test pinning and unpinning a running app, and checking if it is pinned.
-TEST_F(ShelfModelTest, RunningAppPinning) {
-  const std::string app_id("app_id");
-
-  // Check the initial state.
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(1, model_->item_count());
-
-  // Add an example running app.
-  ShelfItem item;
-  item.type = TYPE_APP;
-  item.status = STATUS_RUNNING;
-  item.id = ShelfID(app_id);
-  const int index = model_->Add(item);
-
-  // The item should be added but not pinned.
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_APP, model_->items()[index].type);
-  EXPECT_EQ(item.id, model_->items()[index].id);
-
-  // Pinning the item should just change its type.
-  model_->PinAppWithID(app_id);
-  EXPECT_TRUE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_PINNED_APP, model_->items()[index].type);
-  EXPECT_EQ(item.id, model_->items()[index].id);
-
-  // Pinning the same app id again should have no change.
-  model_->PinAppWithID(app_id);
-  EXPECT_TRUE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_PINNED_APP, model_->items()[index].type);
-  EXPECT_EQ(item.id, model_->items()[index].id);
-
-  // Unpinning the app should leave the item unpinnned but running.
-  model_->UnpinAppWithID(app_id);
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_APP, model_->items()[index].type);
-  EXPECT_EQ(item.id, model_->items()[index].id);
-
-  // Unpinning the same app id again should have no change.
-  model_->UnpinAppWithID(app_id);
-  EXPECT_FALSE(model_->IsAppPinned(app_id));
-  EXPECT_EQ(2, model_->item_count());
-  EXPECT_EQ(TYPE_APP, model_->items()[index].type);
-  EXPECT_EQ(item.id, model_->items()[index].id);
-}
-
-}  // namespace ash