OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <atlbase.h> | 5 #include <atlbase.h> |
6 #include <atlapp.h> | 6 #include <atlapp.h> |
7 #include <atlmisc.h> | 7 #include <atlmisc.h> |
8 #include <atlwin.h> | 8 #include <atlwin.h> |
9 | 9 |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 } | 212 } |
213 | 213 |
214 void RunUntilCloseInfobar() { | 214 void RunUntilCloseInfobar() { |
215 EXPECT_CALL(frame_, CloseInfobar()).WillOnce(QUIT_LOOP(message_loop_)); | 215 EXPECT_CALL(frame_, CloseInfobar()).WillOnce(QUIT_LOOP(message_loop_)); |
216 ASSERT_NO_FATAL_FAILURE(message_loop_.RunFor(5)); // seconds | 216 ASSERT_NO_FATAL_FAILURE(message_loop_.RunFor(5)); // seconds |
217 } | 217 } |
218 | 218 |
219 chrome_frame_test::TimedMsgLoop message_loop_; | 219 chrome_frame_test::TimedMsgLoop message_loop_; |
220 }; // class ReadyPromptWindowButtonTest | 220 }; // class ReadyPromptWindowButtonTest |
221 | 221 |
222 TEST_F(ReadyPromptTest, ReadyPromptContentTest) { | 222 // This test has been disabled due to bug |
| 223 // http://code.google.com/p/chromium/issues/detail?id=94362 |
| 224 TEST_F(ReadyPromptTest, DISABLED_ReadyPromptContentTest) { |
223 // owned by ReadyPromptContent | 225 // owned by ReadyPromptContent |
224 MockReadyModeState* state = new MockReadyModeState(); | 226 MockReadyModeState* state = new MockReadyModeState(); |
225 MockUrlLauncher* url_launcher = new MockUrlLauncher(); | 227 MockUrlLauncher* url_launcher = new MockUrlLauncher(); |
226 | 228 |
227 scoped_ptr<ReadyPromptContent> content_(new ReadyPromptContent(state, | 229 scoped_ptr<ReadyPromptContent> content_(new ReadyPromptContent(state, |
228 url_launcher)); | 230 url_launcher)); |
229 | 231 |
230 content_->InstallInFrame(&frame_); | 232 content_->InstallInFrame(&frame_); |
231 | 233 |
232 // Ensure that, if a child is created, it is not visible yet. | 234 // Ensure that, if a child is created, it is not visible yet. |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 | 278 |
277 TEST_F(ReadyPromptWindowButtonTest, ClickIgnore) { | 279 TEST_F(ReadyPromptWindowButtonTest, ClickIgnore) { |
278 EXPECT_CALL(*state_, PermanentlyDeclineChromeFrame()); | 280 EXPECT_CALL(*state_, PermanentlyDeclineChromeFrame()); |
279 ASSERT_TRUE(ClickOnCaption(L"Ignore")); | 281 ASSERT_TRUE(ClickOnCaption(L"Ignore")); |
280 RunUntilCloseInfobar(); | 282 RunUntilCloseInfobar(); |
281 } | 283 } |
282 | 284 |
283 // TODO(erikwright): test WebBrowserAdapter | 285 // TODO(erikwright): test WebBrowserAdapter |
284 // TODO(erikwright): an integration test of ReadyMode::Configure with a mock | 286 // TODO(erikwright): an integration test of ReadyMode::Configure with a mock |
285 // IWebBrowser2? | 287 // IWebBrowser2? |
OLD | NEW |