net: Remove typedef net::URLRequestStatus URLRequestStatus;

chrome_frame/test/url_request_test.cc

 // Copyright (c) 2011 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/scoped_com_initializer.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/test_server.h"
@@ skipping 23 matching lines @@
   ASSERT_HRESULT_SUCCEEDED(s->Seek(current_pos, STREAM_SEEK_SET, NULL));
 }
 
 class MockUrlDelegate : public PluginUrlRequestDelegate {
  public:
   MOCK_METHOD7(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));
   MOCK_METHOD2(OnReadComplete, void(int request_id, const std::string& data));
   MOCK_METHOD2(OnResponseEnd, void(int request_id,
-                                   const URLRequestStatus& status));
+                                   const net::URLRequestStatus& status));
   MOCK_METHOD4(OnCookiesRetrieved, void(bool success, const GURL& url,
       const std::string& cookie, int cookie_id));
 
   static bool ImplementsThreadSafeReferenceCounting() {
     return false;
   }
   void AddRef() {}
   void Release() {}
 
   void PostponeReadRequest(chrome_frame_test::TimedMsgLoop* loop,
@@ skipping 123 matching lines @@
 
   // Expect headers
   EXPECT_CALL(mock, OnResponseStarted(1, testing::_,
                                       testing::StartsWith("HTTP/1.1 404"),
                                       testing::_, testing::_, testing::_,
                                       testing::_))
     .Times(1)
     .WillOnce(QUIT_LOOP_SOON(loop, 2));
 
   EXPECT_CALL(mock, OnResponseEnd(1, testing::Property(
-              &URLRequestStatus::os_error, net::ERR_TUNNEL_CONNECTION_FAILED)))
+              &net::URLRequestStatus::os_error,
+              net::ERR_TUNNEL_CONNECTION_FAILED)))
     .Times(testing::AtMost(1));
 
   request.Start();
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   request.Release();
 }
 
 TEST(UrlmonUrlRequestTest, ZeroLengthResponse) {
   MockUrlDelegate mock;
   chrome_frame_test::TimedMsgLoop loop;
@@ skipping 25 matching lines @@
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   EXPECT_FALSE(loop.WasTimedOut());
 
   // Should stay quiet, since we do not ask for anything for awhile.
   EXPECT_CALL(mock, OnResponseEnd(1, testing::_)).Times(0);
   loop.RunFor(3);
 
   // Invoke read. Only now the response end ("server closed the connection")
   // is supposed to be delivered.
   EXPECT_CALL(mock, OnResponseEnd(1, testing::Property(
-                                     &URLRequestStatus::is_success, true)))
-      .Times(1);
+      &net::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, request_id,
       bytes_to_read), 0);
 }
 ACTION_P3(ManagerEndRequest, loop, mgr, request_id) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mgr,
       &UrlmonUrlRequestManager::EndUrlRequest, request_id,
-      URLRequestStatus()), 0);
+      net::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));
@@ skipping 47 matching lines @@
   EXPECT_CALL(mock, OnReadComplete(1, testing::_))
     .Times(0);
 
   EXPECT_CALL(mock, OnResponseEnd(1, testing::_))
     .Times(0);
 
   mgr->StartUrlRequest(1, r1);
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   mgr.reset();
 }