| Index: chrome/browser/extensions/extension_processes_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_processes_apitest.cc b/chrome/browser/extensions/extension_processes_apitest.cc
|
| deleted file mode 100644
|
| index fc3daa77569bd6515431c03fc2b50b0688e34c3f..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/extensions/extension_processes_apitest.cc
|
| +++ /dev/null
|
| @@ -1,56 +0,0 @@
|
| -// 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/command_line.h"
|
| -#include "chrome/browser/extensions/extension_apitest.h"
|
| -#include "chrome/browser/extensions/extension_test_message_listener.h"
|
| -#include "chrome/browser/task_manager/task_manager.h"
|
| -#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
|
| -#include "chrome/browser/ui/browser.h"
|
| -#include "chrome/browser/ui/browser_window.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| -
|
| -// Sometimes times out on Mac OS and Windows
|
| -// crbug.com/97499
|
| -// Also on Linux: crbug.com/130138
|
| -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) {
|
| -#else
|
| -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) {
|
| -#endif
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableExperimentalExtensionApis);
|
| -
|
| - ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableExperimentalExtensionApis);
|
| -
|
| - // Ensure task manager is not yet updating
|
| - TaskManagerModel* model = TaskManager::GetInstance()->model();
|
| - EXPECT_EQ(0, model->update_requests_);
|
| - EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_);
|
| -
|
| - // Load extension that adds listener in background page
|
| - ExtensionTestMessageListener listener("ready", false);
|
| - ASSERT_TRUE(LoadExtension(
|
| - test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
|
| - ASSERT_TRUE(listener.WaitUntilSatisfied());
|
| -
|
| - // Ensure the task manager has started updating
|
| - EXPECT_EQ(1, model->update_requests_);
|
| - EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
|
| -
|
| - // Now show the task manager and wait for it to be ready
|
| - TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser());
|
| -
|
| - EXPECT_EQ(2, model->update_requests_);
|
| - EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
|
| -
|
| - // Unload the extension and check that listener count decreases
|
| - UnloadExtension(last_loaded_extension_id_);
|
| - EXPECT_EQ(1, model->update_requests_);
|
| -}
|
|
|