ash: Rename LauncherModelObserver to ShelfModelObserver.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
-#include "ash/launcher/launcher_model_observer.h"
+#include "ash/shelf/shelf_model_observer.h"
 #include "ash/shell.h"
 #include "ash/test/launcher_item_delegate_manager_test_api.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 53 matching lines @@
 
 // As defined in /chromeos/dbus/cryptohome_client.cc.
 const char kUserIdHashSuffix[] = "-hash";
 
 // An extension prefix.
 const char kCrxAppPrefix[] = "_crx_";
 }
 
 namespace {
 
-// LauncherModelObserver implementation that tracks what messages are invoked.
-class TestLauncherModelObserver : public ash::LauncherModelObserver {
+// ShelfModelObserver implementation that tracks what messages are invoked.
+class TestShelfModelObserver : public ash::ShelfModelObserver {
  public:
-  TestLauncherModelObserver()
+  TestShelfModelObserver()
     : added_(0),
       removed_(0),
       changed_(0) {
   }
 
-  virtual ~TestLauncherModelObserver() {
+  virtual ~TestShelfModelObserver() {
   }
 
-  // LauncherModelObserver
-  virtual void LauncherItemAdded(int index) OVERRIDE {
+  // Overridden from ash::ShelfModelObserver:
+  virtual void ShelfItemAdded(int index) OVERRIDE {
     ++added_;
     last_index_ = index;
   }
 
-  virtual void LauncherItemRemoved(int index, ash::LauncherID id) OVERRIDE {
+  virtual void ShelfItemRemoved(int index, ash::LauncherID id) OVERRIDE {
     ++removed_;
     last_index_ = index;
   }
 
-  virtual void LauncherItemChanged(int index,
-                                   const ash::LauncherItem& old_item) OVERRIDE {
+  virtual void ShelfItemChanged(int index,
+                                const ash::LauncherItem& old_item) OVERRIDE {
     ++changed_;
     last_index_ = index;
   }
 
-  virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE {
+  virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE {
     last_index_ = target_index;
   }
 
-  virtual void LauncherStatusChanged() OVERRIDE {
+  virtual void ShelfStatusChanged() OVERRIDE {
   }
 
   void clear_counts() {
     added_ = 0;
     removed_ = 0;
     changed_ = 0;
     last_index_ = 0;
   }
 
   int added() const { return added_; }
   int removed() const { return removed_; }
   int changed() const { return changed_; }
   int last_index() const { return last_index_; }
 
  private:
   int added_;
   int removed_;
   int changed_;
   int last_index_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestLauncherModelObserver);
+  DISALLOW_COPY_AND_ASSIGN(TestShelfModelObserver);
 };
 
 // Test implementation of AppIconLoader.
 class TestAppIconLoaderImpl : public extensions::AppIconLoader {
  public:
   TestAppIconLoaderImpl() : fetch_count_(0) {
   }
 
   virtual ~TestAppIconLoaderImpl() {
   }
@@ skipping 112 matching lines @@
     SetHostDesktopType(chrome::HOST_DESKTOP_TYPE_ASH);
   }
 
   virtual ~ChromeLauncherControllerTest() {
   }
 
   virtual void SetUp() OVERRIDE {
     BrowserWithTestWindowTest::SetUp();
 
     model_.reset(new ash::LauncherModel);
-    model_observer_.reset(new TestLauncherModelObserver);
+    model_observer_.reset(new TestShelfModelObserver);
     model_->AddObserver(model_observer_.get());
 
     if (ash::Shell::HasInstance()) {
       item_delegate_manager_ =
           ash::Shell::GetInstance()->launcher_item_delegate_manager();
     } else {
       item_delegate_manager_ =
           new ash::LauncherItemDelegateManager(model_.get());
     }
 
@@ skipping 297 matching lines @@
   // Needed for extension service & friends to work.
   scoped_refptr<Extension> extension1_;
   scoped_refptr<Extension> extension2_;
   scoped_refptr<Extension> extension3_;
   scoped_refptr<Extension> extension4_;
   scoped_refptr<Extension> extension5_;
   scoped_refptr<Extension> extension6_;
   scoped_refptr<Extension> extension7_;
   scoped_refptr<Extension> extension8_;
   scoped_ptr<ChromeLauncherController> launcher_controller_;
-  scoped_ptr<TestLauncherModelObserver> model_observer_;
+  scoped_ptr<TestShelfModelObserver> model_observer_;
   scoped_ptr<ash::LauncherModel> model_;
 
   // |item_delegate_manager_| owns |test_controller_|.
   LauncherItemController* test_controller_;
 
   ExtensionService* extension_service_;
 
   ash::LauncherItemDelegateManager* item_delegate_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerTest);
@@ skipping 1985 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }