| OLD | NEW |
| 1 // Copyright (c) 2010 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_TEST_WITH_WEB_SERVER_H_ | 5 #ifndef CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ |
| 6 #define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ | 6 #define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ |
| 7 #pragma once |
| 7 | 8 |
| 8 #include <windows.h> | 9 #include <windows.h> |
| 9 #include <string> | 10 #include <string> |
| 10 | 11 |
| 11 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 12 #include "base/stringprintf.h" | 13 #include "base/stringprintf.h" |
| 13 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
| 15 #include "base/win/scoped_handle.h" |
| 14 #include "chrome_frame/test/chrome_frame_test_utils.h" | 16 #include "chrome_frame/test/chrome_frame_test_utils.h" |
| 15 #include "chrome_frame/test/http_server.h" | 17 #include "chrome_frame/test/http_server.h" |
| 16 #include "chrome_frame/test/test_server.h" | 18 #include "chrome_frame/test/test_server.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 18 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
| 19 | 21 |
| 20 // Include without path to make GYP build see it. | 22 // Include without path to make GYP build see it. |
| 21 #include "chrome_tab.h" // NOLINT | 23 #include "chrome_tab.h" // NOLINT |
| 22 | 24 |
| 23 // Specifies the invocation method for CF. | 25 // Specifies the invocation method for CF. |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 return "Safari"; | 211 return "Safari"; |
| 210 default: | 212 default: |
| 211 NOTREACHED(); | 213 NOTREACHED(); |
| 212 break; | 214 break; |
| 213 } | 215 } |
| 214 return ""; | 216 return ""; |
| 215 } | 217 } |
| 216 | 218 |
| 217 BrowserKind browser_; | 219 BrowserKind browser_; |
| 218 FilePath results_dir_; | 220 FilePath results_dir_; |
| 219 ScopedHandle browser_handle_; | 221 base::win::ScopedHandle browser_handle_; |
| 220 // The on-disk path to our html test files. | 222 // The on-disk path to our html test files. |
| 221 FilePath test_file_path_; | 223 FilePath test_file_path_; |
| 222 | 224 |
| 223 FilePath CFInstall_path_; | 225 FilePath CFInstall_path_; |
| 224 FilePath CFInstance_path_; | 226 FilePath CFInstance_path_; |
| 225 | 227 |
| 226 chrome_frame_test::TimedMsgLoop loop_; | 228 chrome_frame_test::TimedMsgLoop loop_; |
| 227 testing::StrictMock<MockWebServer> server_mock_; | 229 testing::StrictMock<MockWebServer> server_mock_; |
| 228 }; | 230 }; |
| 229 | 231 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 // Same as above except that the response does not include the no-cache header. | 340 // Same as above except that the response does not include the no-cache header. |
| 339 ACTION_P2(SendAllowCacheResponse, server, invocation) { | 341 ACTION_P2(SendAllowCacheResponse, server, invocation) { |
| 340 server->SendResponseHelper(arg0, arg1, invocation, false); | 342 server->SendResponseHelper(arg0, arg1, invocation, false); |
| 341 } | 343 } |
| 342 | 344 |
| 343 ACTION_P2(HandlePostedResponseHelper, server, invocation) { | 345 ACTION_P2(HandlePostedResponseHelper, server, invocation) { |
| 344 server->HandlePostedResponse(arg0, arg2); | 346 server->HandlePostedResponse(arg0, arg2); |
| 345 } | 347 } |
| 346 | 348 |
| 347 #endif // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ | 349 #endif // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ |
| OLD | NEW |