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_per_app.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
index bfae61f62cf29fa79dde8e83fa1ac729b2458d2c..b463bdb036a674abb098e69e8f972eb333f4d124 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
@@ -25,6 +25,7 @@
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -65,7 +66,8 @@ class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver,
                                        public content::NotificationObserver,
                                        public PrefServiceSyncableObserver,
                                        public AppSyncUIStateObserver,
-                                       public ExtensionEnableFlowDelegate {
+                                       public ExtensionEnableFlowDelegate,
+                                       public chrome::BrowserListObserver {
  public:
   ChromeLauncherControllerPerApp(Profile* profile, ash::LauncherModel* model);
   virtual ~ChromeLauncherControllerPerApp();
@@ -295,6 +297,9 @@ class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver,
   // Note that for incognito windows the incognito icon will be returned.
   gfx::Image GetAppListIcon(content::WebContents* web_contents) const;
 
+  // Overridden from chrome::BrowserListObserver.
+  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+
  protected:
   // ChromeLauncherController overrides:
 
@@ -314,6 +319,9 @@ class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver,
  private:
   friend class ChromeLauncherControllerPerAppTest;
 
+  // Updates the activation state of the Broswer item.
+  void UpdateBrowserItemStatus();
+
   typedef std::map<ash::LauncherID, LauncherItemController*>
           IDToItemControllerMap;
   typedef std::list<content::WebContents*> WebContentsList;