Renames LauncherID, LauncherItem and LauncherItems...

ash/shelf/shelf_navigator_unittest.cc

 // 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_navigator.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_model.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 
 namespace {
 
 class ShelfNavigatorTest : public testing::Test {
  public:
   ShelfNavigatorTest() {}
 
  protected:
   virtual void SetUp() OVERRIDE {
     model_.reset(new ShelfModel);
 
     // Add APP_LIST for test.
-    LauncherItem app_list;
+    ShelfItem app_list;
     app_list.type = TYPE_APP_LIST;
     model_->Add(app_list);
 
     // Initially, applist launcher item is only created.
     int total_num = model_->item_count();
     EXPECT_EQ(1, total_num);
     EXPECT_TRUE(model_->items()[0].type == TYPE_APP_LIST);
 
     // Add BROWSER_SHORTCUT for test.
-    LauncherItem browser_shortcut;
+    ShelfItem browser_shortcut;
     browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
     model_->Add(browser_shortcut);
   }
 
   void SetupMockShelfModel(ShelfItemType* types,
                            int types_length,
                            int focused_index) {
     for (int i = 0; i < types_length; ++i) {
-      LauncherItem new_item;
+      ShelfItem new_item;
       new_item.type = types[i];
       new_item.status =
           (types[i] == TYPE_PLATFORM_APP) ? STATUS_RUNNING : STATUS_CLOSED;
       model_->Add(new_item);
     }
 
     // Set the focused item.
     if (focused_index >= 0) {
-      LauncherItem focused_item =model_->items()[focused_index];
+      ShelfItem focused_item =model_->items()[focused_index];
       if (focused_item.type == TYPE_PLATFORM_APP) {
         focused_item.status = STATUS_ACTIVE;
         model_->Set(focused_index, focused_item);
       }
     }
   }
 
   const ShelfModel& model() { return *model_.get(); }
 
  private:
@@ skipping 119 matching lines @@
   };
   // Special case: no items are 'STATUS_ACTIVE'.
   SetupMockShelfModel(types, arraysize(types), -1);
 
   // If there are no active status, pick the first running item as a fallback.
   EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_FORWARD));
   EXPECT_EQ(1, GetNextActivatedItemIndex(model(), CYCLE_BACKWARD));
 }
 
 }  // namespace ash