| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 const content::NotificationSource& source, | 73 const content::NotificationSource& source, |
| 74 const content::NotificationDetails& details) OVERRIDE { | 74 const content::NotificationDetails& details) OVERRIDE { |
| 75 base::MessageLoopForUI::current()->Quit(); | 75 base::MessageLoopForUI::current()->Quit(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 private: | 78 private: |
| 79 content::NotificationRegistrar registrar_; | 79 content::NotificationRegistrar registrar_; |
| 80 DISALLOW_COPY_AND_ASSIGN(BrowserClosedObserver); | 80 DISALLOW_COPY_AND_ASSIGN(BrowserClosedObserver); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 // The delay waited in some cases where we don't have a notifications for an | |
| 84 // action we take. | |
| 85 const int kActionDelayMs = 500; | |
| 86 | |
| 87 const char kDebuggerTestPage[] = "files/devtools/debugger_test_page.html"; | 83 const char kDebuggerTestPage[] = "files/devtools/debugger_test_page.html"; |
| 88 const char kPauseWhenLoadingDevTools[] = | 84 const char kPauseWhenLoadingDevTools[] = |
| 89 "files/devtools/pause_when_loading_devtools.html"; | 85 "files/devtools/pause_when_loading_devtools.html"; |
| 90 const char kPauseWhenScriptIsRunning[] = | 86 const char kPauseWhenScriptIsRunning[] = |
| 91 "files/devtools/pause_when_script_is_running.html"; | 87 "files/devtools/pause_when_script_is_running.html"; |
| 92 const char kPageWithContentScript[] = | 88 const char kPageWithContentScript[] = |
| 93 "files/devtools/page_with_content_script.html"; | 89 "files/devtools/page_with_content_script.html"; |
| 94 const char kNavigateBackTestPage[] = | 90 const char kNavigateBackTestPage[] = |
| 95 "files/devtools/navigate_back.html"; | 91 "files/devtools/navigate_back.html"; |
| 96 const char kChunkedTestPage[] = "chunked"; | 92 const char kChunkedTestPage[] = "chunked"; |
| (...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 #if defined(OS_WIN) && defined(USE_ASH) | 660 #if defined(OS_WIN) && defined(USE_ASH) |
| 665 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 661 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 666 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 662 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 667 return; | 663 return; |
| 668 #endif | 664 #endif |
| 669 | 665 |
| 670 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 666 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 671 } | 667 } |
| 672 | 668 |
| 673 } // namespace | 669 } // namespace |
| OLD | NEW |