| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/cancelable_callback.h" | 6 #include "base/cancelable_callback.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 content::NotificationRegistrar registrar; | 345 content::NotificationRegistrar registrar; |
| 346 registrar.Add(this, | 346 registrar.Add(this, |
| 347 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, | 347 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, |
| 348 content::NotificationService::AllSources()); | 348 content::NotificationService::AllSources()); |
| 349 base::CancelableClosure timeout( | 349 base::CancelableClosure timeout( |
| 350 base::Bind(&TimeoutCallback, "Extension host load timed out.")); | 350 base::Bind(&TimeoutCallback, "Extension host load timed out.")); |
| 351 base::MessageLoop::current()->PostDelayedTask( | 351 base::MessageLoop::current()->PostDelayedTask( |
| 352 FROM_HERE, timeout.callback(), TestTimeouts::action_timeout()); | 352 FROM_HERE, timeout.callback(), TestTimeouts::action_timeout()); |
| 353 | 353 |
| 354 extensions::ProcessManager* manager = | 354 extensions::ProcessManager* manager = |
| 355 extensions::ExtensionSystem::Get(browser()->profile())-> | 355 extensions::ProcessManager::Get(browser()->profile()); |
| 356 process_manager(); | |
| 357 extensions::ProcessManager::ViewSet all_views = manager->GetAllViews(); | 356 extensions::ProcessManager::ViewSet all_views = manager->GetAllViews(); |
| 358 for (extensions::ProcessManager::ViewSet::const_iterator iter = | 357 for (extensions::ProcessManager::ViewSet::const_iterator iter = |
| 359 all_views.begin(); | 358 all_views.begin(); |
| 360 iter != all_views.end();) { | 359 iter != all_views.end();) { |
| 361 if (!(*iter)->IsLoading()) | 360 if (!(*iter)->IsLoading()) |
| 362 ++iter; | 361 ++iter; |
| 363 else | 362 else |
| 364 content::RunMessageLoop(); | 363 content::RunMessageLoop(); |
| 365 } | 364 } |
| 366 | 365 |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 | 929 |
| 931 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { | 930 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { |
| 932 #if defined(OS_WIN) && defined(USE_ASH) | 931 #if defined(OS_WIN) && defined(USE_ASH) |
| 933 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 932 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 934 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 933 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 935 return; | 934 return; |
| 936 #endif | 935 #endif |
| 937 | 936 |
| 938 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 937 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 939 } | 938 } |
| OLD | NEW |