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

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.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/app_shortcut_launcher_item_controller.h"
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
@@ skipping 15 matching lines @@
 // item with the appropriate LauncherItemController type).
 AppShortcutLauncherItemController::AppShortcutLauncherItemController(
     const std::string& app_id,
     ChromeLauncherControllerPerApp* controller)
     : LauncherItemController(TYPE_SHORTCUT, app_id, controller),
       app_controller_(controller) {
   // To detect V1 applications we use their domain and match them against the
   // used URL. This will also work with applications like Google Drive.
   const Extension* extension =
       launcher_controller()->GetExtensionForAppID(app_id);
-  refocus_url_ = GURL(extension->launch_web_url() + "*");
+  // Some unit tests have no real extension and will set their
+  if (extension)
+    refocus_url_ = GURL(extension->launch_web_url() + "*");
 }
 
 AppShortcutLauncherItemController::~AppShortcutLauncherItemController() {
 }
 
 string16 AppShortcutLauncherItemController::GetTitle() {
   return GetAppTitle();
 }
 
 bool AppShortcutLauncherItemController::HasWindow(aura::Window* window) const {
   std::vector<content::WebContents*> content =
       app_controller_->GetV1ApplicationsFromAppId(app_id());
   for (size_t i = 0; i < content.size(); i++) {
     Browser* browser = chrome::FindBrowserWithWebContents(content[i]);
     if (browser && browser->window()->GetNativeWindow() == window)
       return true;
   }
   return false;
 }
 
 bool AppShortcutLauncherItemController::IsOpen() const {
   return !app_controller_->GetV1ApplicationsFromAppId(app_id()).empty();
 }
 
 void AppShortcutLauncherItemController::Launch(int event_flags) {
   app_controller_->LaunchApp(app_id(), event_flags);
 }
 
 void AppShortcutLauncherItemController::Activate() {
-  std::vector<content::WebContents*> content =
-      app_controller_->GetV1ApplicationsFromAppId(app_id());
+  std::vector<content::WebContents*> content = GetRunningApplications();
   if (content.empty()) {
     Launch(ui::EF_NONE);
     return;
   }
   Browser* browser = chrome::FindBrowserWithWebContents(content[0]);
   TabStripModel* tab_strip = browser->tab_strip_model();
   int index = tab_strip->GetIndexOfWebContents(content[0]);
   DCHECK_NE(TabStripModel::kNoTab, index);
   tab_strip->ActivateTabAt(index, false);
   browser->window()->Show();
@@ skipping 82 matching lines @@
       // time, and might therefore loose it's "app" status.
       if (refocus_pattern.MatchesURL(tab_url) &&
           (!refocus_pattern.match_all_urls() ||
            launcher_controller()->GetPerAppInterface()->
               IsWebContentHandledByApplication(web_contents, app_id())))
         items.push_back(web_contents);
     }
   }
   return items;
 }