Remove the old task manager view

chrome/browser/extensions/app_background_page_apitest.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 "base/location.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.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_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_notification_tracker.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/browser/nacl_process_host.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #endif
 
 using base::ASCIIToUTF16;
 using extensions::Extension;
 
 class AppBackgroundPageApiTest : public ExtensionApiTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
@@ skipping 245 matching lines @@
   // the app was loaded.
   ASSERT_TRUE(WaitForBackgroundMode(true));
 
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
   UnloadExtension(extension->id());
 }
 
+// Old task manager browser tests should only run on Mac.

[tapted, 2016/04/26 01:08:08]

I'm not sure this is testing the old task manager - just running a test that
requires the task manager to be running for some reason? I don't really
understand the mechanisms for it though. But, certainly, this test existed
_before_ r229862 when the chrome::ShowTaskManager(..) line was added, so it
would be incorrect to remove the entire test on any platform.

[afakhry, 2016/04/26 22:22:43]

You're right. Thanks for catching that!
However the crash in http://crbug.com/165138 is only relevant to the old task
manager code, but it doesn't hurt to open the new task manager on the other
platforms too.

Done.

+#if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsBackgroundPage) {
   // Keep the task manager up through this test to verify that a crash doesn't
   // happen when window.open creates a background page that switches
   // RenderViewHosts. See http://crbug.com/165138.
-  // This test is for the old implementation of the task manager. We must
-  // explicitly disable the new one.
-  task_manager::browsertest_util::EnableOldTaskManager();
   chrome::ShowTaskManager(browser());
 
   // Make sure that no BackgroundContentses get deleted (a signal that repeated
   // window.open calls recreate instances, instead of being no-ops).
   content::TestNotificationTracker background_deleted_tracker;
   background_deleted_tracker.ListenFor(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
       content::Source<Profile>(browser()->profile()));
 
   host_resolver()->AddRule("a.com", "127.0.0.1");
@@ skipping 31 matching lines @@
   // The test makes sure that window.open returns null.
   ASSERT_TRUE(RunExtensionTest("app_background_page/no_js")) << message_;
   // And after it runs there should be a background page.
   ASSERT_TRUE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
 
   EXPECT_EQ(0u, background_deleted_tracker.size());
   UnloadExtension(extension->id());
 }
+#endif  // defined(OS_MACOSX)
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsManifestBackgroundPage) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   std::string app_manifest = base::StringPrintf(
       "{"
       "  \"name\": \"App\","
       "  \"version\": \"0.1\","
       "  \"manifest_version\": 2,"
@@ skipping 262 matching lines @@
       extensions::ProcessManager::Get(browser()->profile());
   ImpulseCallbackCounter idle_impulse_counter(manager, extension()->id());
   EXPECT_TRUE(nacl_modules_loaded.WaitUntilSatisfied());
 
   manager->SetKeepaliveImpulseDecrementCallbackForTesting(
       idle_impulse_counter.SetGoalAndGetCallback(1));
   nacl_modules_loaded.Reply("be idle");
   idle_impulse_counter.Wait();
 #endif
 }