ash: Rename LauncherModelObserver to ShelfModelObserver.

ash/launcher/launcher_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 <set>
 #include <string>
 
 #include "ash/ash_switches.h"
-#include "ash/launcher/launcher_model_observer.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"
 
 namespace ash {
 
 namespace {
 
-// LauncherModelObserver implementation that tracks what message are invoked.
-class TestLauncherModelObserver : public LauncherModelObserver {
+// ShelfModelObserver implementation that tracks what message are invoked.
+class TestShelfModelObserver : public ShelfModelObserver {
  public:
-  TestLauncherModelObserver()
+  TestShelfModelObserver()
       : added_count_(0),
         removed_count_(0),
         changed_count_(0),
         moved_count_(0) {
   }
 
   // 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;
   }
 
-  // LauncherModelObserver overrides:
-  virtual void LauncherItemAdded(int index) OVERRIDE {
+  // ShelfModelObserver overrides:
+  virtual void ShelfItemAdded(int index) OVERRIDE {
     added_count_++;
   }
-  virtual void LauncherItemRemoved(int index, LauncherID id) OVERRIDE {
+  virtual void ShelfItemRemoved(int index, LauncherID id) OVERRIDE {
     removed_count_++;
   }
-  virtual void LauncherItemChanged(int index,
-                                   const LauncherItem& old_item) OVERRIDE {
+  virtual void ShelfItemChanged(int index,
+                                const LauncherItem& old_item) OVERRIDE {
     changed_count_++;
   }
-  virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE {
+  virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE {
     moved_count_++;
   }
-  virtual void LauncherStatusChanged() OVERRIDE {
+  virtual void ShelfStatusChanged() 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_;
   int removed_count_;
   int changed_count_;
   int moved_count_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestLauncherModelObserver);
+  DISALLOW_COPY_AND_ASSIGN(TestShelfModelObserver);
 };
 
 }  // namespace
 
 class LauncherModelTest : public testing::Test {
  public:
   LauncherModelTest() {}
   virtual ~LauncherModelTest() {}
 
   virtual void SetUp() {
     model_.reset(new LauncherModel);
-    observer_.reset(new TestLauncherModelObserver);
+    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<TestLauncherModelObserver> observer_;
+  scoped_ptr<TestShelfModelObserver> observer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LauncherModelTest);
 };
 
 TEST_F(LauncherModelTest, BasicAssertions) {
   // Add an item.
   LauncherItem item;
   item.type = TYPE_APP_SHORTCUT;
   int index = model_->Add(item);
@@ skipping 283 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