Positions the launcher in the bottom left corner. Adds ShellDelegate

ui/aura_shell/launcher/launcher_model_unittest.cc

Index: ui/aura_shell/launcher/launcher_model_unittest.cc
diff --git a/ui/aura_shell/launcher/launcher_model_unittest.cc b/ui/aura_shell/launcher/launcher_model_unittest.cc
index c55deccfdafd97c910da9671226668952acf1eda..0c10e13b5bee2109f714462b962b7f340f4842e4 100644
--- a/ui/aura_shell/launcher/launcher_model_unittest.cc
+++ b/ui/aura_shell/launcher/launcher_model_unittest.cc
@@ -7,9 +7,6 @@
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura_shell/launcher/launcher_model_observer.h"
-#include "views/view.h"
-
-using views::View;
 
 namespace aura_shell {
 
@@ -21,15 +18,16 @@ class TestLauncherModelObserver : public LauncherModelObserver {
   TestLauncherModelObserver()
       : added_count_(0),
         removed_count_(0),
-        selection_changed_count_(0) {
+        images_changed_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(base::StringPrintf("added=%d removed=%d s_changed=%d",
-        added_count_, removed_count_, selection_changed_count_));
-    added_count_ = removed_count_ = selection_changed_count_ = 0;
+    std::string result(
+        base::StringPrintf("added=%d removed=%d images_changed=%d",
+        added_count_, removed_count_, images_changed_count_));
+    added_count_ = removed_count_ = images_changed_count_ = 0;
     return result;
   }
 
@@ -40,14 +38,14 @@ class TestLauncherModelObserver : public LauncherModelObserver {
   virtual void LauncherItemRemoved(int index) OVERRIDE {
     removed_count_++;
   }
-  virtual void LauncherSelectionChanged() OVERRIDE {
-    selection_changed_count_++;
+  virtual void LauncherItemImagesChanged(int index) OVERRIDE {
+    images_changed_count_++;
   }
 
-  private:
+ private:
   int added_count_;
   int removed_count_;
-  int selection_changed_count_;
+  int images_changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLauncherModelObserver);
 };
@@ -59,29 +57,32 @@ TEST(TestLauncher, BasicAssertions) {
   LauncherModel model;
   // Add an item.
   model.AddObserver(&observer);
-  EXPECT_EQ(-1, model.selected_index());
-  View* view = new View;
-  model.AddItem(view, 0, true);
+  LauncherItem item;
+  model.Add(0, item);
   EXPECT_EQ(1, model.item_count());
-  EXPECT_EQ(view, model.view_at(0));
-  EXPECT_EQ(true, model.is_draggable(0));
-  EXPECT_EQ(-1, model.selected_index());
-  EXPECT_EQ("added=1 removed=0 s_changed=0", observer.StateStringAndClear());
-
-  EXPECT_EQ(0, model.IndexOfItemByView(view));
-  EXPECT_EQ(-1, model.IndexOfItemByView(NULL));
+  EXPECT_EQ("added=1 removed=0 images_changed=0",
+            observer.StateStringAndClear());
 
-  // Change the selection.
-  model.SetSelectedIndex(0);
-  EXPECT_EQ("added=0 removed=0 s_changed=1", observer.StateStringAndClear());
+  // Change a tabbed image.
+  model.SetTabbedImages(0, LauncherTabbedImages());
+  EXPECT_EQ("added=0 removed=0 images_changed=1",
+            observer.StateStringAndClear());
 
   // Remove the item.
   model.RemoveItemAt(0);
-  delete view;  // We now own the view.
-  view = NULL;
   EXPECT_EQ(0, model.item_count());
-  EXPECT_EQ(0, model.selected_index());
-  EXPECT_EQ("added=0 removed=1 s_changed=0", observer.StateStringAndClear());
+  EXPECT_EQ("added=0 removed=1 images_changed=0",
+            observer.StateStringAndClear());
+
+  // Add an app item.
+  item.type = TYPE_APP;
+  model.Add(0, item);
+  observer.StateStringAndClear();
+
+  // Change an app image.
+  model.SetAppImage(0, SkBitmap());
+  EXPECT_EQ("added=0 removed=0 images_changed=1",
+            observer.StateStringAndClear());
 }
 
 }  // namespace aura_shell