Fix browser window shelf id init; re-enable browser test.

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 2013 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_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
@@ skipping 48 matching lines @@
 }
 
 }  // namespace
 
 BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController(
     ChromeLauncherController* launcher_controller,
     ash::ShelfModel* shelf_model)
     : LauncherItemController(extension_misc::kChromeAppId,
                              std::string(),
                              launcher_controller),
-      shelf_model_(shelf_model) {}
+      shelf_model_(shelf_model) {
+  // Tag all open browser windows with the appropriate shelf id property. This
+  // associates each window with the shelf item for the active web contents.
+  for (auto* browser : *BrowserList::GetInstance()) {
+    if (IsBrowserRepresentedInBrowserList(browser) &&
+        browser->tab_strip_model()->GetActiveWebContents()) {
+      SetShelfIDForBrowserWindowContents(
+          browser, browser->tab_strip_model()->GetActiveWebContents());
+    }
+  }
+}
 
 BrowserShortcutLauncherItemController::
     ~BrowserShortcutLauncherItemController() {}
 
 void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
   // Determine the new browser's active state and change if necessary.
   int browser_index =
       shelf_model_->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);
   DCHECK_GE(browser_index, 0);
   ash::ShelfItem browser_item = shelf_model_->items()[browser_index];
@@ skipping 192 matching lines @@
   return ash::SHELF_ACTION_WINDOW_ACTIVATED;
 }
 
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   // Only Ash desktop browser windows for the active user are represented.
   if (!browser || !IsBrowserFromActiveUser(browser))
     return false;
 
   // v1 App popup windows with a valid app id have their own icon.
-  if (browser->is_app() && browser->is_type_popup() &&
-      ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppID(
-          web_app::GetExtensionIdFromApplicationName(browser->app_name())) > 0)
+  ash::ShelfDelegate* delegate = ash::WmShell::Get()->shelf_delegate();
+  if (browser->is_app() && browser->is_type_popup() && delegate &&
+      delegate->GetShelfIDForAppID(web_app::GetExtensionIdFromApplicationName(
+          browser->app_name())) > 0) {
     return false;
+  }
 
   // Settings browsers have their own icon.
   if (IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }
 
 BrowserList::BrowserVector
 BrowserShortcutLauncherItemController::GetListOfActiveBrowsers() {
   BrowserList::BrowserVector active_browsers;
   for (auto* browser : *BrowserList::GetInstance()) {
     // Make sure that the browser is from the current user, has a proper window,
     // and the window was already shown.
     if (!IsBrowserFromActiveUser(browser))
       continue;
     if (!browser->window()->GetNativeWindow()->IsVisible() &&
         !browser->window()->IsMinimized()) {
       continue;
     }
     if (!IsBrowserRepresentedInBrowserList(browser) &&
         !browser->is_type_tabbed())
       continue;
     active_browsers.push_back(browser);
   }
   return active_browsers;
 }