Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new…

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <string>
 
 #include "ash/launcher/launcher_delegate.h"
@@ skipping 264 matching lines @@
       const ash::LauncherItem& item, aura::RootWindow* root) OVERRIDE = 0;
   virtual ui::MenuModel* CreateApplicationMenu(
       const ash::LauncherItem& item) OVERRIDE = 0;
   virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE = 0;
   virtual bool IsDraggable(const ash::LauncherItem& item) OVERRIDE = 0;
 
  protected:
   friend class BrowserLauncherItemControllerTest;
   friend class LauncherPlatformAppBrowserTest;
   friend class LauncherAppBrowserTest;
+  // TODO(skuhne): Remove these when the old launcher get removed.
+  friend class LauncherPlatformPerAppAppBrowserTest;
+  friend class LauncherPerAppAppBrowserTest;
 
   // Creates a new app shortcut item and controller on the launcher at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
   virtual ash::LauncherID CreateAppShortcutLauncherItem(
       const std::string& app_id,
       int index) = 0;
 
   // Sets the AppTabHelper/AppIconLoader, taking ownership of the helper class.
   // These are intended for testing.
   virtual void SetAppTabHelperForTest(AppTabHelper* helper) = 0;
   virtual void SetAppIconLoaderForTest(AppIconLoader* loader) = 0;
   virtual const std::string& GetAppIdFromLauncherIdForTest(
       ash::LauncherID id) = 0;
 
  private:
   static ChromeLauncherController* instance_;
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_