Clean up Automation and Chrome Frame IPC code.

chrome_frame/test/url_request_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "app/win_util.h"
 #include "chrome_frame/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 222 matching lines @@
   // is supposed to be delivered.
   EXPECT_CALL(mock, OnResponseEnd(1, testing::Property(
                                      &URLRequestStatus::is_success, true)))
       .Times(1);
   request.Read(512);
   request.Release();
 }
 
 ACTION_P4(ManagerRead, loop, mgr, request_id, bytes_to_read) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mgr,
-      &UrlmonUrlRequestManager::ReadUrlRequest, 0, request_id,
+      &UrlmonUrlRequestManager::ReadUrlRequest, request_id,
       bytes_to_read), 0);
 }
 ACTION_P3(ManagerEndRequest, loop, mgr, request_id) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mgr,
-      &UrlmonUrlRequestManager::EndUrlRequest, 0, request_id,
+      &UrlmonUrlRequestManager::EndUrlRequest, request_id,
       URLRequestStatus()), 0);
 }
 
 // Simplest test - retrieve file from local web server.
 TEST(UrlmonUrlRequestManagerTest, Simple1) {
   MockUrlDelegate mock;
   chrome_frame_test::TimedMsgLoop loop;
 
   testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1",
       chrome_frame_test::GetTestDataFolder());
   mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
 
   scoped_ptr<UrlmonUrlRequestManager> mgr(new UrlmonUrlRequestManager());
   mgr->set_delegate(&mock);
-  IPC::AutomationURLRequest r1(
+  AutomationURLRequest r1(
       WideToUTF8(mock_server.Resolve(L"chrome_frame_window_open.html")),
       "get", "", "", NULL, 0, 0);
 
   EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
                              testing::_, testing::_, testing::_))
       .Times(1)
       .WillOnce(ManagerRead(&loop, mgr.get(), 1, 512));
 
   EXPECT_CALL(mock, OnReadComplete(1, testing::Property(&std::string::size,
                                                         testing::Gt(0u))))
     .Times(testing::AtLeast(1))
     .WillRepeatedly(ManagerRead(&loop, mgr.get(), 1, 2));
 
   EXPECT_CALL(mock, OnResponseEnd(1, testing::_))
     .Times(1)
     .WillOnce(QUIT_LOOP_SOON(loop, 2));
 
-  mgr->StartUrlRequest(0, 1, r1);
+  mgr->StartUrlRequest(1, r1);
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   mgr.reset();
 }
 
 TEST(UrlmonUrlRequestManagerTest, Abort1) {
   MockUrlDelegate mock;
   chrome_frame_test::TimedMsgLoop loop;
 
   testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1",
       chrome_frame_test::GetTestDataFolder());
   mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
 
   scoped_ptr<UrlmonUrlRequestManager> mgr(new UrlmonUrlRequestManager());
   mgr->set_delegate(&mock);
-  IPC::AutomationURLRequest r1(
+  AutomationURLRequest r1(
       WideToUTF8(mock_server.Resolve(L"chrome_frame_window_open.html")),
       "get", "", "", NULL, 0, 0);
 
   EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
                                testing::_, testing::_, testing::_))
     .Times(1)
     .WillOnce(testing::DoAll(
         ManagerEndRequest(&loop, mgr.get(), 1),
         QUIT_LOOP_SOON(loop, 3)));
 
   EXPECT_CALL(mock, OnReadComplete(1, testing::_))
     .Times(0);
 
   EXPECT_CALL(mock, OnResponseEnd(1, testing::_))
     .Times(0);
 
-  mgr->StartUrlRequest(0, 1, r1);
+  mgr->StartUrlRequest(1, r1);
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   mgr.reset();
 }