| 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 // This test has been disabled due to bug | 222 TEST_F(ReadyPromptTest, ReadyPromptContentTest) { |
| 223 // http://code.google.com/p/chromium/issues/detail?id=94362 | |
| 224 TEST_F(ReadyPromptTest, DISABLED_ReadyPromptContentTest) { | |
| 225 // owned by ReadyPromptContent | 223 // owned by ReadyPromptContent |
| 226 MockReadyModeState* state = new MockReadyModeState(); | 224 MockReadyModeState* state = new MockReadyModeState(); |
| 227 MockUrlLauncher* url_launcher = new MockUrlLauncher(); | 225 MockUrlLauncher* url_launcher = new MockUrlLauncher(); |
| 228 | 226 |
| 229 scoped_ptr<ReadyPromptContent> content_(new ReadyPromptContent(state, | 227 scoped_ptr<ReadyPromptContent> content_(new ReadyPromptContent(state, |
| 230 url_launcher)); | 228 url_launcher)); |
| 231 | 229 |
| 232 content_->InstallInFrame(&frame_); | 230 content_->InstallInFrame(&frame_); |
| 233 | 231 |
| 234 // Ensure that, if a child is created, it is not visible yet. | 232 // 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... |
| 278 | 276 |
| 279 TEST_F(ReadyPromptWindowButtonTest, ClickIgnore) { | 277 TEST_F(ReadyPromptWindowButtonTest, ClickIgnore) { |
| 280 EXPECT_CALL(*state_, PermanentlyDeclineChromeFrame()); | 278 EXPECT_CALL(*state_, PermanentlyDeclineChromeFrame()); |
| 281 ASSERT_TRUE(ClickOnCaption(L"Ignore")); | 279 ASSERT_TRUE(ClickOnCaption(L"Ignore")); |
| 282 RunUntilCloseInfobar(); | 280 RunUntilCloseInfobar(); |
| 283 } | 281 } |
| 284 | 282 |
| 285 // TODO(erikwright): test WebBrowserAdapter | 283 // TODO(erikwright): test WebBrowserAdapter |
| 286 // TODO(erikwright): an integration test of ReadyMode::Configure with a mock | 284 // TODO(erikwright): an integration test of ReadyMode::Configure with a mock |
| 287 // IWebBrowser2? | 285 // IWebBrowser2? |
| OLD | NEW |