OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/location.h" | 5 #include "base/location.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 ASSERT_TRUE( | 301 ASSERT_TRUE( |
302 BackgroundContentsServiceFactory::GetForProfile(browser()->profile())-> | 302 BackgroundContentsServiceFactory::GetForProfile(browser()->profile())-> |
303 GetAppBackgroundContents(ASCIIToUTF16(extension->id()))); | 303 GetAppBackgroundContents(ASCIIToUTF16(extension->id()))); |
304 UnloadExtension(extension->id()); | 304 UnloadExtension(extension->id()); |
305 } | 305 } |
306 | 306 |
307 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsBackgroundPage) { | 307 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsBackgroundPage) { |
308 // Keep the task manager up through this test to verify that a crash doesn't | 308 // Keep the task manager up through this test to verify that a crash doesn't |
309 // happen when window.open creates a background page that switches | 309 // happen when window.open creates a background page that switches |
310 // RenderViewHosts. See http://crbug.com/165138. | 310 // RenderViewHosts. See http://crbug.com/165138. |
311 // This test is for the old implementation of the task manager. We must | |
312 // explicitly disable the new one. | |
313 task_manager::browsertest_util::EnableOldTaskManager(); | |
314 chrome::ShowTaskManager(browser()); | 311 chrome::ShowTaskManager(browser()); |
315 | 312 |
316 // Make sure that no BackgroundContentses get deleted (a signal that repeated | 313 // Make sure that no BackgroundContentses get deleted (a signal that repeated |
317 // window.open calls recreate instances, instead of being no-ops). | 314 // window.open calls recreate instances, instead of being no-ops). |
318 content::TestNotificationTracker background_deleted_tracker; | 315 content::TestNotificationTracker background_deleted_tracker; |
319 background_deleted_tracker.ListenFor( | 316 background_deleted_tracker.ListenFor( |
320 chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED, | 317 chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED, |
321 content::Source<Profile>(browser()->profile())); | 318 content::Source<Profile>(browser()->profile())); |
322 | 319 |
323 host_resolver()->AddRule("a.com", "127.0.0.1"); | 320 host_resolver()->AddRule("a.com", "127.0.0.1"); |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 extensions::ProcessManager::Get(browser()->profile()); | 634 extensions::ProcessManager::Get(browser()->profile()); |
638 ImpulseCallbackCounter idle_impulse_counter(manager, extension()->id()); | 635 ImpulseCallbackCounter idle_impulse_counter(manager, extension()->id()); |
639 EXPECT_TRUE(nacl_modules_loaded.WaitUntilSatisfied()); | 636 EXPECT_TRUE(nacl_modules_loaded.WaitUntilSatisfied()); |
640 | 637 |
641 manager->SetKeepaliveImpulseDecrementCallbackForTesting( | 638 manager->SetKeepaliveImpulseDecrementCallbackForTesting( |
642 idle_impulse_counter.SetGoalAndGetCallback(1)); | 639 idle_impulse_counter.SetGoalAndGetCallback(1)); |
643 nacl_modules_loaded.Reply("be idle"); | 640 nacl_modules_loaded.Reply("be idle"); |
644 idle_impulse_counter.Wait(); | 641 idle_impulse_counter.Wait(); |
645 #endif | 642 #endif |
646 } | 643 } |
OLD | NEW |