ash: Replace launcher app type with Extension launch type.

chrome/browser/ui/views/ash/launcher/launcher_updater_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/views/ash/launcher/launcher_updater.h"
 
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_model.h"
@@ skipping 225 matching lines @@
     TestTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
     TabContentsWrapper panel_tab(CreateTestWebContents());
     app_icon_loader_->SetAppID(&panel_tab, "1");  // Panels are apps.
     tab_strip.InsertTabContentsAt(0, &panel_tab, TabStripModel::ADD_ACTIVE);
     LauncherUpdater updater(&window, &tab_strip, launcher_delegate_.get(),
                             LauncherUpdater::TYPE_APP_PANEL, std::string());
     updater.Init();
     ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
     EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
-    ash::LauncherID id = GetItem(&updater).id;
-    EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_APP_PANEL,
-              launcher_delegate_->GetAppType(id));
     EXPECT_EQ(static_cast<void*>(NULL), updater.favicon_loader_.get());
   }
 
   // Add an Extension panel.
   {
     aura::Window window(NULL);
     TestTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
     TabContentsWrapper panel_tab(CreateTestWebContents());
     app_icon_loader_->SetAppID(&panel_tab, "1");  // Panels are apps.
     tab_strip.InsertTabContentsAt(0, &panel_tab, TabStripModel::ADD_ACTIVE);
     LauncherUpdater updater(&window, &tab_strip, launcher_delegate_.get(),
                             LauncherUpdater::TYPE_EXTENSION_PANEL,
                             std::string());
     updater.Init();
     ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
     EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
-    ash::LauncherID id = GetItem(&updater).id;
-    EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_EXTENSION_PANEL,
-              launcher_delegate_->GetAppType(id));
     EXPECT_NE(static_cast<void*>(NULL), updater.favicon_loader_.get());
   }
 }
 
 // Verifies pinned apps are persisted and restored.
 TEST_F(LauncherUpdaterTest, PersistPinned) {
   size_t initial_size = launcher_model_->items().size();
   TabContentsWrapper tab1(CreateTestWebContents());
 
   app_icon_loader_->SetAppID(&tab1, "1");
 
   app_icon_loader_->GetAndClearFetchCount();
-  launcher_delegate_->PinAppWithID("1",
-                                   ChromeLauncherDelegate::APP_TYPE_WINDOW);
+  launcher_delegate_->PinAppWithID("1");
   EXPECT_GT(app_icon_loader_->GetAndClearFetchCount(), 0);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
             launcher_model_->items()[1].type);
   EXPECT_TRUE(launcher_delegate_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_delegate_->IsAppPinned("0"));
   EXPECT_EQ(initial_size + 1, launcher_model_->items().size());
 
   launcher_delegate_.reset(
       new ChromeLauncherDelegate(profile(), launcher_model_.get()));
   app_icon_loader_ = new AppIconLoaderImpl;
@@ skipping 61 matching lines @@
   EXPECT_EQ(&state1.window, activation_client_->GetActiveWindow());
 
   // And to the second item active.
   ash::LauncherItem new_item2(launcher_model_->items()[index2]);
   new_item2.status = ash::STATUS_ACTIVE;
   launcher_model_->Set(index2, new_item2);
   EXPECT_EQ(ash::STATUS_RUNNING, launcher_model_->items()[index1].status);
   EXPECT_EQ(ash::STATUS_ACTIVE, launcher_model_->items()[index2].status);
   EXPECT_EQ(&state2.window, activation_client_->GetActiveWindow());
 }