ash: Rename LauncherModel to ShelfModel.

ash/shelf/shelf_model_unittest.cc

 // Copyright (c) 2012 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/launcher/launcher_model.h"
+#include "ash/shelf/shelf_model.h"
 
 #include <set>
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 52 matching lines @@
   int added_count_;
   int removed_count_;
   int changed_count_;
   int moved_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfModelObserver);
 };
 
 }  // namespace
 
-class LauncherModelTest : public testing::Test {
+class ShelfModelTest : public testing::Test {
  public:
-  LauncherModelTest() {}
-  virtual ~LauncherModelTest() {}
+  ShelfModelTest() {}
+  virtual ~ShelfModelTest() {}
 
   virtual void SetUp() {
-    model_.reset(new LauncherModel);
+    model_.reset(new ShelfModel);
     observer_.reset(new TestShelfModelObserver);
     EXPECT_EQ(0, model_->item_count());
 
     LauncherItem item;
     item.type = TYPE_APP_LIST;
     model_->Add(item);
     EXPECT_EQ(1, model_->item_count());
 
     model_->AddObserver(observer_.get());
   }
 
   virtual void TearDown() {
     observer_.reset();
     model_.reset();
   }
 
-  scoped_ptr<LauncherModel> model_;
+  scoped_ptr<ShelfModel> model_;
   scoped_ptr<TestShelfModelObserver> observer_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(LauncherModelTest);
+  DISALLOW_COPY_AND_ASSIGN(ShelfModelTest);
 };
 
-TEST_F(LauncherModelTest, BasicAssertions) {
+TEST_F(ShelfModelTest, BasicAssertions) {
   // Add an item.
   LauncherItem item;
   item.type = TYPE_APP_SHORTCUT;
   int index = model_->Add(item);
   EXPECT_EQ(2, model_->item_count());
   EXPECT_EQ("added=1", observer_->StateStringAndClear());
 
   // Change to a platform app item.
   LauncherID original_id = model_->items()[index].id;
   item.type = TYPE_PLATFORM_APP;
@@ skipping 31 matching lines @@
   EXPECT_EQ("moved=1", observer_->StateStringAndClear());
 
   // Verifies all the items get unique ids.
   std::set<LauncherID> 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(LauncherModelTest, AddIndices) {
+TEST_F(ShelfModelTest, AddIndices) {
   // Insert browser short cut at index 1.
   LauncherItem browser_shortcut;
   browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
   int browser_shortcut_index = model_->Add(browser_shortcut);
   EXPECT_EQ(1, browser_shortcut_index);
 
   // platform app items should be after browser shortcut.
   LauncherItem item;
   item.type = TYPE_PLATFORM_APP;
   int platform_app_index1 = model_->Add(item);
@@ skipping 59 matching lines @@
   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);
 }
 
 // Assertions around where items are added.
-TEST_F(LauncherModelTest, AddIndicesForLegacyShelfLayout) {
+TEST_F(ShelfModelTest, AddIndicesForLegacyShelfLayout) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       ash::switches::kAshDisableAlternateShelfLayout);
 
   // Insert browser short cut at index 0.
   LauncherItem browser_shortcut;
   browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
   int browser_shortcut_index = model_->Add(browser_shortcut);
   EXPECT_EQ(0, browser_shortcut_index);
 
   // platform app items should be after browser shortcut.
@@ skipping 62 matching lines @@
   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()[1].type);
   EXPECT_EQ(TYPE_APP_LIST, model_->items()[model_->FirstPanelIndex() - 1].type);
 }
 
 // Assertions around id generation and usage.
-TEST_F(LauncherModelTest, LauncherIDTests) {
+TEST_F(ShelfModelTest, LauncherIDTests) {
   // Get the next to use ID counter.
   LauncherID id = model_->next_id();
 
   // Calling this function multiple times does not change the returned ID.
   EXPECT_EQ(model_->next_id(), id);
 
   // Check that when we reserve a value it will be the previously retrieved ID,
   // but it will not change the item count and retrieving the next ID should
   // produce something new.
   EXPECT_EQ(model_->reserve_external_id(), id);
   EXPECT_EQ(1, model_->item_count());
   LauncherID id2 = model_->next_id();
   EXPECT_NE(id2, id);
 
   // Adding another item to the list should also produce a new ID.
   LauncherItem item;
   item.type = TYPE_PLATFORM_APP;
   model_->Add(item);
   EXPECT_NE(model_->next_id(), id2);
 }
 
 // This verifies that converting an existing item into a lower weight category
 // (e.g. shortcut to running but not pinned app) will move it to the proper
 // location. See crbug.com/248769.
-TEST_F(LauncherModelTest, CorrectMoveItemsWhenStateChange) {
+TEST_F(ShelfModelTest, CorrectMoveItemsWhenStateChange) {
   // The first item is the app list and last item is the browser.
   LauncherItem browser_shortcut;
   browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
   int browser_shortcut_index = model_->Add(browser_shortcut);
   EXPECT_EQ(TYPE_APP_LIST, model_->items()[0].type);
   EXPECT_EQ(1, browser_shortcut_index);
 
   // Add three shortcuts. They should all be moved between the two.
   LauncherItem item;
   item.type = TYPE_APP_SHORTCUT;
   int app1_index = model_->Add(item);
   EXPECT_EQ(2, app1_index);
   int app2_index = model_->Add(item);
   EXPECT_EQ(3, app2_index);
   int app3_index = model_->Add(item);
   EXPECT_EQ(4, app3_index);
 
   // Now change the type of the second item and make sure that it is moving
   // behind the shortcuts.
   item.type = TYPE_PLATFORM_APP;
   model_->Set(app2_index, item);
 
   // The item should have moved in front of the app launcher.
   EXPECT_EQ(TYPE_PLATFORM_APP, model_->items()[4].type);
 }
 
-TEST_F(LauncherModelTest, CorrectMoveItemsWhenStateChangeForLegacyShelfLayout) {
+TEST_F(ShelfModelTest, CorrectMoveItemsWhenStateChangeForLegacyShelfLayout) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       ash::switches::kAshDisableAlternateShelfLayout);
 
   // The first item is the browser and the second item is app list.
   LauncherItem browser_shortcut;
   browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
   int browser_shortcut_index = model_->Add(browser_shortcut);
   EXPECT_EQ(0, browser_shortcut_index);
   EXPECT_EQ(TYPE_APP_LIST, model_->items()[1].type);
 
@@ skipping 10 matching lines @@
   // Now change the type of the second item and make sure that it is moving
   // behind the shortcuts.
   item.type = TYPE_PLATFORM_APP;
   model_->Set(app2_index, item);
 
   // The item should have moved in front of the app launcher.
   EXPECT_EQ(TYPE_PLATFORM_APP, model_->items()[3].type);
 }
 
 }  // namespace ash