OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 <string> | 5 #include <string> |
6 #include <windows.h> | 6 #include <windows.h> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 wait_for_initial_loads_ = false; | 73 wait_for_initial_loads_ = false; |
74 | 74 |
75 // We're testing the renderer rather than the browser assertion here, | 75 // We're testing the renderer rather than the browser assertion here, |
76 // because the browser assertion would flunk the test during SetUp() | 76 // because the browser assertion would flunk the test during SetUp() |
77 // (since TAU wouldn't be able to find the browser window). | 77 // (since TAU wouldn't be able to find the browser window). |
78 launch_arguments_.AppendSwitch(switches::kRendererAssertTest); | 78 launch_arguments_.AppendSwitch(switches::kRendererAssertTest); |
79 } | 79 } |
80 }; | 80 }; |
81 | 81 |
82 // Launch the app in assertion test mode, then close the app. | 82 // Launch the app in assertion test mode, then close the app. |
83 TEST_F(AssertionTest, Assertion) { | 83 TEST_F(AssertionTest, DISABLED_Assertion) { |
84 if (UITest::in_process_renderer()) { | 84 if (UITest::in_process_renderer()) { |
85 // in process mode doesn't do the crashing. | 85 // in process mode doesn't do the crashing. |
86 expected_errors_ = 0; | 86 expected_errors_ = 0; |
87 expected_crashes_ = 0; | 87 expected_crashes_ = 0; |
88 } else { | 88 } else { |
89 expected_errors_ = 1; | 89 expected_errors_ = 1; |
90 expected_crashes_ = 1; | 90 expected_crashes_ = 1; |
91 } | 91 } |
92 } | 92 } |
93 #endif // NDEBUG | 93 #endif // NDEBUG |
(...skipping 15 matching lines...) Expand all Loading... |
109 if (UITest::in_process_renderer()) { | 109 if (UITest::in_process_renderer()) { |
110 // in process mode doesn't do the crashing. | 110 // in process mode doesn't do the crashing. |
111 expected_crashes_ = 0; | 111 expected_crashes_ = 0; |
112 } else { | 112 } else { |
113 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 113 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
114 ASSERT_TRUE(browser.get()); | 114 ASSERT_TRUE(browser.get()); |
115 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); | 115 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); |
116 expected_crashes_ = 1; | 116 expected_crashes_ = 1; |
117 } | 117 } |
118 } | 118 } |
OLD | NEW |