ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

chrome/browser/ui/ash/launcher/browser_launcher_item_controller_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 "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 
 #include <map>
 #include <string>
 
 #include "ash/ash_switches.h"
@@ skipping 222 matching lines @@
 
   // Owned by BrowserLauncherItemController.
   AppTabHelperImpl* app_tab_helper_;
   AppIconLoaderImpl* app_icon_loader_;
 
   scoped_ptr<aura::test::TestActivationClient> activation_client_;
 };
 
 // Verify that the launcher item positions are persisted and restored.
 TEST_F(LauncherItemControllerPerAppTest, PersistLauncherItemPositions) {
+  EXPECT_EQ(ash::TYPE_APP_LIST,
+            launcher_model_->items()[0].type);
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
-            launcher_model_->items()[0].type);
-  EXPECT_EQ(ash::TYPE_APP_LIST,
             launcher_model_->items()[1].type);
   scoped_ptr<content::WebContents> tab1(CreateTestWebContents());
   scoped_ptr<content::WebContents> tab2(CreateTestWebContents());
   app_tab_helper_->SetAppID(tab1.get(), "1");
   app_tab_helper_->SetAppID(tab1.get(), "2");
 
   EXPECT_FALSE(launcher_delegate_->IsAppPinned("1"));
   launcher_delegate_->PinAppWithID("1");
   EXPECT_TRUE(launcher_delegate_->IsAppPinned("1"));
   launcher_delegate_->PinAppWithID("2");
 
+  EXPECT_EQ(ash::TYPE_APP_LIST,
+            launcher_model_->items()[0].type);
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
+            launcher_model_->items()[1].type);
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
+            launcher_model_->items()[2].type);
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
+            launcher_model_->items()[3].type);
+
+  launcher_model_->Move(1, 3);
+  EXPECT_EQ(ash::TYPE_APP_LIST,
             launcher_model_->items()[0].type);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[1].type);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[2].type);
-  EXPECT_EQ(ash::TYPE_APP_LIST,
-            launcher_model_->items()[3].type);
-
-  launcher_model_->Move(0, 2);
-  EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
-            launcher_model_->items()[0].type);
-  EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
-            launcher_model_->items()[1].type);
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
-            launcher_model_->items()[2].type);
-  EXPECT_EQ(ash::TYPE_APP_LIST,
             launcher_model_->items()[3].type);
 
   launcher_delegate_.reset();
   launcher_model_.reset(new ash::LauncherModel);
   launcher_delegate_.reset(
       ChromeLauncherController::CreateInstance(profile(),
                                                launcher_model_.get()));
   app_tab_helper_ = new AppTabHelperImpl;
   app_tab_helper_->SetAppID(tab1.get(), "1");
   app_tab_helper_->SetAppID(tab2.get(), "2");
   ResetAppTabHelper();
 
   launcher_delegate_->Init();
 
-  EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
+  EXPECT_EQ(ash::TYPE_APP_LIST,
             launcher_model_->items()[0].type);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[1].type);
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
+            launcher_model_->items()[2].type);
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
-            launcher_model_->items()[2].type);
-  EXPECT_EQ(ash::TYPE_APP_LIST,
             launcher_model_->items()[3].type);
 }
 
 class BrowserLauncherItemControllerTest
     : public LauncherItemControllerPerAppTest {
  public:
   BrowserLauncherItemControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 85 matching lines @@
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[app_index].type);
 
   UnpinAppsWithID("1");
   ASSERT_EQ(initial_size, launcher_model_->items().size());
 }
 
 // Verify that launcher item positions are persisted and restored.
 TEST_F(BrowserLauncherItemControllerTest,
     PersistLauncherItemPositionsPerBrowser) {
-  int browser_shortcut_index = 0;
-  int app_list_index = 1;
+  int app_list_index = 0;
+  int browser_shortcut_index = 1;
 
+  EXPECT_EQ(ash::TYPE_APP_LIST,
+            launcher_model_->items()[app_list_index].type);
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
             launcher_model_->items()[browser_shortcut_index].type);
-  EXPECT_EQ(ash::TYPE_APP_LIST,
-            launcher_model_->items()[app_list_index].type);
 
   scoped_ptr<content::WebContents> tab1(CreateTestWebContents());
   scoped_ptr<content::WebContents> tab2(CreateTestWebContents());
 
   app_tab_helper_->SetAppID(tab1.get(), "1");
   app_tab_helper_->SetAppID(tab2.get(), "2");
 
   app_icon_loader_->GetAndClearFetchCount();
   launcher_delegate_->PinAppWithID("1");
   ash::LauncherID id = launcher_delegate_->GetLauncherIDForAppID("1");
   int app1_index = launcher_model_->ItemIndexByID(id);
 
   launcher_delegate_->PinAppWithID("2");
   id = launcher_delegate_->GetLauncherIDForAppID("2");
   int app2_index = launcher_model_->ItemIndexByID(id);
 
   launcher_model_->Move(browser_shortcut_index, app1_index);
 
-  browser_shortcut_index = 1;
-  app1_index = 0;
+  std::swap(browser_shortcut_index, app1_index);
 
   EXPECT_GT(app_icon_loader_->GetAndClearFetchCount(), 0);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[app1_index].type);
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
             launcher_model_->items()[browser_shortcut_index].type);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[app2_index].type);
 
   launcher_delegate_.reset();
@@ skipping 97 matching lines @@
   EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);
 
   // App window should go to attention state.
   app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);
 
   // Activating app window should clear attention state.
   activation_client_->ActivateWindow(&app_state.window);
   EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
 }