| 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 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 chrome::CloseWindow(browser()); | 696 chrome::CloseWindow(browser()); |
| 697 AcceptModalDialog(); | 697 AcceptModalDialog(); |
| 698 CancelModalDialog(); | 698 CancelModalDialog(); |
| 699 cancel_browser.Wait(); | 699 cancel_browser.Wait(); |
| 700 } | 700 } |
| 701 // Try to exit application. | 701 // Try to exit application. |
| 702 { | 702 { |
| 703 content::WindowedNotificationObserver close_observer( | 703 content::WindowedNotificationObserver close_observer( |
| 704 chrome::NOTIFICATION_BROWSER_CLOSED, | 704 chrome::NOTIFICATION_BROWSER_CLOSED, |
| 705 content::Source<Browser>(browser())); | 705 content::Source<Browser>(browser())); |
| 706 chrome::StartKeepAlive(); | 706 chrome::IncrementKeepAliveCount(); |
| 707 chrome::CloseAllBrowsers(); | 707 chrome::CloseAllBrowsers(); |
| 708 AcceptModalDialog(); | 708 AcceptModalDialog(); |
| 709 AcceptModalDialog(); | 709 AcceptModalDialog(); |
| 710 close_observer.Wait(); | 710 close_observer.Wait(); |
| 711 } | 711 } |
| 712 for (size_t i = 0; i < close_observers.size(); ++i) { | 712 for (size_t i = 0; i < close_observers.size(); ++i) { |
| 713 close_observers[i]->Wait(); | 713 close_observers[i]->Wait(); |
| 714 delete close_observers[i]; | 714 delete close_observers[i]; |
| 715 } | 715 } |
| 716 } | 716 } |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 977 | 977 |
| 978 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { | 978 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { |
| 979 #if defined(OS_WIN) && defined(USE_ASH) | 979 #if defined(OS_WIN) && defined(USE_ASH) |
| 980 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 980 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 981 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 981 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 982 return; | 982 return; |
| 983 #endif | 983 #endif |
| 984 | 984 |
| 985 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 985 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 986 } | 986 } |
| OLD | NEW |