| 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 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ | 5 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ |
| 6 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ | 6 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 return navigation_result_; | 130 return navigation_result_; |
| 131 } | 131 } |
| 132 | 132 |
| 133 BEGIN_MSG_MAP(AutomationMockDelegate) | 133 BEGIN_MSG_MAP(AutomationMockDelegate) |
| 134 END_MSG_MAP() | 134 END_MSG_MAP() |
| 135 | 135 |
| 136 protected: | 136 protected: |
| 137 void QuitMessageLoop() { | 137 void QuitMessageLoop() { |
| 138 // Quit on the caller message loop has to be called on the caller | 138 // Quit on the caller message loop has to be called on the caller |
| 139 // thread. | 139 // thread. |
| 140 caller_message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask); | 140 caller_message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
| 141 } | 141 } |
| 142 | 142 |
| 143 private: | 143 private: |
| 144 testing::StrictMock<MockWebServer> mock_server_; | 144 testing::StrictMock<MockWebServer> mock_server_; |
| 145 MessageLoop* caller_message_loop_; | 145 MessageLoop* caller_message_loop_; |
| 146 GURL url_; | 146 GURL url_; |
| 147 bool is_connected_; | 147 bool is_connected_; |
| 148 bool navigation_result_; | 148 bool navigation_result_; |
| 149 }; | 149 }; |
| 150 | 150 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 QuitMessageLoop(); | 231 QuitMessageLoop(); |
| 232 } | 232 } |
| 233 virtual void OnLoad(const GURL& url) { | 233 virtual void OnLoad(const GURL& url) { |
| 234 Base::OnLoad(url); | 234 Base::OnLoad(url); |
| 235 } | 235 } |
| 236 private: | 236 private: |
| 237 bool request_start_result_; | 237 bool request_start_result_; |
| 238 }; | 238 }; |
| 239 | 239 |
| 240 #endif // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ | 240 #endif // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ |
| OLD | NEW |