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

chrome/browser/task_manager/task_manager_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/task_manager/task_manager.h"
 
 #include "base/file_path.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_test_message_listener.h"
+#include "chrome/browser/extensions/platform_app_launcher.h"
+#include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 41 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
 
     // Do not prelaunch the GPU process and disable accelerated compositing
     // for these tests as the GPU process will show up in task manager but
     // whether it appears before or after the new tab renderer process is not
     // well defined.
     command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch);
     command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
   }
+
+  int GetResourceCountAfterLoad() {
+    // Show the task manager. This populates the model, and helps with debugging
+    // (you see the task manager).
+    browser()->window()->ShowTaskManager();
+    // Wait for loading of task manager.
+    TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
+    return TaskManager::GetInstance()->model()->ResourceCount();
+  }
 };
 
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 #define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen
 #else
 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen
 #endif
 
 // Regression test for http://crbug.com/13361
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ShutdownWhileOpen) {
@@ skipping 267 matching lines @@
   string16 prefix = l10n_util::GetStringFUTF16(
       IDS_TASK_MANAGER_APP_PREFIX, string16());
   ASSERT_TRUE(StartsWith(model()->GetResourceTitle(resource_count),
                          prefix, true));
 
   // Unload extension to avoid crash on Windows.
   UnloadExtension(last_loaded_extension_id_);
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 }
 
+namespace {
+  class PlatformAppTestContext : public extensions::PlatformAppBrowserTest {
+  public:
+    PlatformAppTestContext(Browser* browser, NotificationObserver* observer,
+                           FilePath test_data_dir)
+        : browser_(browser), observer_(observer),
+        test_data_dir_(test_data_dir) {
+    }
+    virtual void TestBody() {}
+    virtual void RunTestOnMainThread() {}
+    const extensions::Extension* Launch(const char* name) {
+      return LoadAndLaunchPlatformApp(
+          browser_, observer_, test_data_dir_, name);
+    }
+  private:
+    Browser* browser_;
+    NotificationObserver* observer_;
+    FilePath test_data_dir_;
+  };
+} //  namespace
+
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticePlatformAppTabs) {
+  int resource_count = GetResourceCountAfterLoad();
+
+  PlatformAppTestContext platform_app_test_context(
+      browser(), this, test_data_dir_);
+  ExtensionTestMessageListener launched_listener("Launched", false);
+  const extensions::Extension* extension =
+      platform_app_test_context.Launch("minimal");
+  (void)extension;
+
+  ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
+
+  TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);
+  string16 prefix;
+
+
+  // First new entry should be the background page. The title should start with
+  // "Background Page:".
+  ASSERT_EQ(TaskManager::Resource::EXTENSION, model()->GetResourceType(
+      resource_count));
+
+  // TODO(tapted) Can we get the background page when not loaded via
+  // TabContents?
+  // ASSERT_TRUE(model()->GetResourceWebContents(resource_count) != NULL);
+  // ASSERT_TRUE(model()->GetResourceExtension(resource_count) == extension);
+
+  prefix = l10n_util::GetStringFUTF16(
+      IDS_TASK_MANAGER_BACKGROUND_PREFIX, string16());
+  ASSERT_TRUE(StartsWith(model()->GetResourceTitle(resource_count),
+                         prefix, true));
+
+  ++resource_count;
+  // Second new entry should be the App Window background page. The title should
+  // start with "Background Page:".
+  ASSERT_EQ(TaskManager::Resource::EXTENSION, model()->GetResourceType(
+      resource_count));
+  // ASSERT_TRUE(model()->GetResourceWebContents(resource_count) != NULL);
+  // ASSERT_TRUE(model()->GetResourceExtension(resource_count) == extension);
+
+  prefix = l10n_util::GetStringFUTF16(
+      IDS_TASK_MANAGER_APP_PREFIX, string16());
+  ASSERT_TRUE(StartsWith(model()->GetResourceTitle(resource_count),
+                         prefix, true));
+
+  // Unload extension to avoid crash on Windows.
+  UnloadExtension(last_loaded_extension_id_);
+  TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
+}
+
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabs) {
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
   browser()->window()->ShowTaskManager();
 
   // New Tab Page.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
   int resource_count = TaskManager::GetInstance()->model()->ResourceCount();
 
   // The app under test acts on URLs whose host is "localhost",
@@ skipping 181 matching lines @@
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
 
   // Check that we get some value for the cache columns.
   DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),
             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
   DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),
             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
   DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),
             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
 }