| Index: chrome_frame/test/url_request_test.cc
|
| diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc
|
| index b1fb6b2ed50d7127b693a4e2dda1277e64a536ed..6c1790f947e870e28a2f834656fd003d01db00a4 100644
|
| --- a/chrome_frame/test/url_request_test.cc
|
| +++ b/chrome_frame/test/url_request_test.cc
|
| @@ -39,10 +39,10 @@ static void AppendToStream(IStream* s, void* buffer, ULONG cb) {
|
|
|
| class MockUrlDelegate : public PluginUrlRequestDelegate {
|
| public:
|
| - MOCK_METHOD8(OnResponseStarted, void(int request_id, const char* mime_type,
|
| + MOCK_METHOD9(OnResponseStarted, void(int request_id, const char* mime_type,
|
| const char* headers, int size, base::Time last_modified,
|
| const std::string& redirect_url, int redirect_status,
|
| - const net::HostPortPair& socket_address));
|
| + const net::HostPortPair& socket_address, uint64 upload_size));
|
| MOCK_METHOD2(OnReadComplete, void(int request_id, const std::string& data));
|
| MOCK_METHOD2(OnResponseEnd, void(int request_id,
|
| const net::URLRequestStatus& status));
|
| @@ -89,7 +89,7 @@ TEST(UrlmonUrlRequestTest, Simple1) {
|
| testing::InSequence s;
|
| EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
|
| testing::_, testing::_, testing::_,
|
| - testing::_))
|
| + testing::_, testing::_))
|
| .Times(1)
|
| .WillOnce(testing::IgnoreResult(testing::InvokeWithoutArgs(CreateFunctor(
|
| &request, &UrlmonUrlRequest::Read, 512))));
|
| @@ -138,7 +138,7 @@ TEST(UrlmonUrlRequestTest, Head) {
|
| testing::InSequence s;
|
| EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
|
| testing::_, testing::_, testing::_,
|
| - testing::_))
|
| + testing::_, testing::_))
|
| .Times(1)
|
| .WillOnce(testing::IgnoreResult(testing::InvokeWithoutArgs(CreateFunctor(
|
| &request, &UrlmonUrlRequest::Read, 512))));
|
| @@ -183,7 +183,7 @@ TEST(UrlmonUrlRequestTest, UnreachableUrl) {
|
| EXPECT_CALL(mock, OnResponseStarted(1, testing::_,
|
| testing::StartsWith("HTTP/1.1 404"),
|
| testing::_, testing::_, testing::_,
|
| - testing::_, testing::_))
|
| + testing::_, testing::_, testing::_))
|
| .Times(1)
|
| .WillOnce(QUIT_LOOP_SOON(loop, base::TimeDelta::FromSeconds(2)));
|
|
|
| @@ -222,7 +222,7 @@ TEST(UrlmonUrlRequestTest, ZeroLengthResponse) {
|
| // Expect headers
|
| EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
|
| testing::_, testing::_, testing::_,
|
| - testing::_))
|
| + testing::_, testing::_))
|
| .Times(1)
|
| .WillOnce(QUIT_LOOP(loop));
|
|
|
| @@ -272,7 +272,8 @@ TEST(UrlmonUrlRequestManagerTest, Simple1) {
|
| r1.load_flags = 0;
|
|
|
| EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
|
| - testing::_, testing::_, testing::_, testing::_))
|
| + testing::_, testing::_, testing::_, testing::_,
|
| + testing::_))
|
| .Times(1)
|
| .WillOnce(ManagerRead(&loop, mgr.get(), 1, 512));
|
|
|
| @@ -308,7 +309,8 @@ TEST(UrlmonUrlRequestManagerTest, Abort1) {
|
| r1.load_flags = 0;
|
|
|
| EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
|
| - testing::_, testing::_, testing::_, testing::_))
|
| + testing::_, testing::_, testing::_, testing::_,
|
| + testing::_))
|
| .Times(1)
|
| .WillOnce(testing::DoAll(
|
| ManagerEndRequest(&loop, mgr.get(), 1),
|
|
|