Do not add TabContents from packaged apps to the task manager.

chrome/browser/extensions/extension_browsertest.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/extensions/extension_browsertest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 57 matching lines @@
   // ExtensionService and then the real profile with one, as we do when
   // running on chromeos.
   command_line->AppendSwitchASCII(switches::kLoginUser,
                                   "TestUser@gmail.com");
   command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
   command_line->AppendSwitch(switches::kNoFirstRun);
 #endif
 }
 
 const Extension* ExtensionBrowserTest::LoadExtensionWithFlags(
+    Browser* browser, NotificationObserver* observer,
     const FilePath& path, int flags) {
-  ExtensionService* service = browser()->profile()->GetExtensionService();
+  ExtensionService* service = browser->profile()->GetExtensionService();
   {
     content::NotificationRegistrar registrar;
-    registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
+    registrar.Add(observer, chrome::NOTIFICATION_EXTENSION_LOADED,
                   content::NotificationService::AllSources());
     scoped_refptr<extensions::UnpackedInstaller> installer(
         extensions::UnpackedInstaller::Create(service));
     installer->set_prompt_for_plugins(false);
     installer->set_require_modern_manifest_version(
         (flags & kFlagAllowOldManifestVersions) == 0);
     installer->Load(path);
     content::RunMessageLoop();
   }
 
@@ skipping 39 matching lines @@
       extension, Extension::ENABLED,
       syncer::StringOrdinal::CreateInitialOrdinal());
 
   // Toggling incognito or file access will reload the extension, so wait for
   // the reload and grab the new extension instance. The default state is
   // incognito disabled and file access enabled, so we don't wait in those
   // cases.
   {
     content::WindowedNotificationObserver load_signal(
         chrome::NOTIFICATION_EXTENSION_LOADED,
-        content::Source<Profile>(browser()->profile()));
+        content::Source<Profile>(browser->profile()));
     CHECK(!service->IsIncognitoEnabled(extension_id));
 
     if (flags & kFlagEnableIncognito) {
       service->SetIsIncognitoEnabled(extension_id, true);
       load_signal.Wait();
       extension = service->GetExtensionById(extension_id, false);
       CHECK(extension) << extension_id << " not found after reloading.";
     }
   }
 
   {
     content::WindowedNotificationObserver load_signal(
         chrome::NOTIFICATION_EXTENSION_LOADED,
-        content::Source<Profile>(browser()->profile()));
+        content::Source<Profile>(browser->profile()));
     CHECK(service->AllowFileAccess(extension));
     if (!(flags & kFlagEnableFileAccess)) {
       service->SetAllowFileAccess(extension, false);
       load_signal.Wait();
       extension = service->GetExtensionById(extension_id, false);
       CHECK(extension) << extension_id << " not found after reloading.";
     }
   }
 
-  if (!WaitForExtensionViewsToLoad())
+  if (!WaitForExtensionViewsToLoad(browser, observer))
     return NULL;
 
   return extension;
 }
 
-const Extension* ExtensionBrowserTest::LoadExtension(const FilePath& path) {
-  return LoadExtensionWithFlags(path, kFlagEnableFileAccess);
+const Extension* ExtensionBrowserTest::LoadExtension(
+    Browser* browser, NotificationObserver* observer, const FilePath& path) {
+  return LoadExtensionWithFlags(browser, observer, path, kFlagEnableFileAccess);
 }
 
 const Extension* ExtensionBrowserTest::LoadExtensionIncognito(
     const FilePath& path) {
   return LoadExtensionWithFlags(path,
                                 kFlagEnableFileAccess | kFlagEnableIncognito);
 }
 
 const Extension* ExtensionBrowserTest::LoadExtensionAsComponent(
     const FilePath& path) {
@@ skipping 262 matching lines @@
       browser()->window()->GetLocationBar()->GetLocationBarForTesting();
   if (location_bar->PageActionVisibleCount() != count) {
     target_visible_page_action_count_ = count;
     ui_test_utils::RegisterAndWait(this,
         chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
         content::NotificationService::AllSources());
   }
   return location_bar->PageActionVisibleCount() == count;
 }
 
-bool ExtensionBrowserTest::WaitForExtensionViewsToLoad() {
+bool ExtensionBrowserTest::WaitForExtensionViewsToLoad(
+    Browser* browser, NotificationObserver* observer) {
   // Wait for all the extension render view hosts that exist to finish loading.
   content::NotificationRegistrar registrar;
-  registrar.Add(this, content::NOTIFICATION_LOAD_STOP,
+  registrar.Add(observer, content::NOTIFICATION_LOAD_STOP,
                 content::NotificationService::AllSources());
 
   ExtensionProcessManager* manager =
-        browser()->profile()->GetExtensionProcessManager();
+        browser->profile()->GetExtensionProcessManager();
   ExtensionProcessManager::ViewSet all_views = manager->GetAllViews();
   for (ExtensionProcessManager::ViewSet::const_iterator iter =
            all_views.begin();
        iter != all_views.end();) {
     if (!(*iter)->IsLoading()) {
       ++iter;
     } else {
       content::RunMessageLoop();
 
       // Test activity may have modified the set of extension processes during
@@ skipping 203 matching lines @@
     case content::NOTIFICATION_LOAD_STOP:
       VLOG(1) << "Got LOAD_STOP notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
     default:
       NOTREACHED();
       break;
   }
 }