net: Remove typedef net::URLRequest URLRequest;

chrome/browser/chrome_plugin_unittest.cc

 // Copyright (c) 2006-2008 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.
 // Tests exercising the Chrome Plugin API.
 
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 24 matching lines @@
   }
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const {
     return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
   }
 
  private:
   ~TestURLRequestContextGetter() {}
   scoped_refptr<URLRequestContext> context_;
 };
 
-class ChromePluginTest : public testing::Test, public URLRequest::Delegate {
+class ChromePluginTest : public testing::Test,
+                         public net::URLRequest::Delegate {
  public:
   ChromePluginTest()
       : io_thread_(BrowserThread::IO, &message_loop_),
         request_(NULL),
         response_buffer_(new net::IOBuffer(kResponseBufferSize)),
         plugin_(NULL),
         expected_payload_(NULL),
         request_context_getter_(new TestURLRequestContextGetter()) {
     test_funcs_.test_make_request = NULL;
   }
 
   // Loads/unloads the chrome test plugin.
   void LoadPlugin();
   void UnloadPlugin();
 
   // Runs the test and expects the given payload as a response.  If expectation
   // is NULL, the request is expected to fail.
   void RunTest(const GURL& url, const TestResponsePayload* expected_payload);
 
-  // URLRequest::Delegate implementations
-  virtual void OnResponseStarted(URLRequest* request);
-  virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+  // net::URLRequest::Delegate implementations
+  virtual void OnResponseStarted(net::URLRequest* request);
+  virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
 
-  // Helper called when the URLRequest is done.
+  // Helper called when the net::URLRequest is done.
   void OnURLRequestComplete();
 
   // testing::Test
   virtual void SetUp() {
     LoadPlugin();
-    URLRequest::RegisterProtocolFactory("test", &URLRequestTestJob::Factory);
+    net::URLRequest::RegisterProtocolFactory("test",
+                                             &URLRequestTestJob::Factory);
 
     // We need to setup a default request context in order to issue HTTP
     // requests.
     DCHECK(!Profile::GetDefaultRequestContext());
     Profile::set_default_request_context(request_context_getter_.get());
   }
   virtual void TearDown() {
     UnloadPlugin();
-    URLRequest::RegisterProtocolFactory("test", NULL);
+    net::URLRequest::RegisterProtocolFactory("test", NULL);
 
     Profile::set_default_request_context(NULL);
 
     // Clear the request before flushing the message loop since killing the
     // request can result in the generation of more tasks.
     request_.reset();
 
     // Flush the message loop to make Purify happy.
     message_loop_.RunAllPending();
   }
  protected:
   MessageLoopForIO message_loop_;
   BrowserThread io_thread_;
 
-  // Note: we use URLRequest (instead of URLFetcher) because this allows the
-  // request to be intercepted.
-  scoped_ptr<URLRequest> request_;
+  // Note: we use net::URLRequest (instead of URLFetcher) because this allows
+  // the request to be intercepted.
+  scoped_ptr<net::URLRequest> request_;
   scoped_refptr<net::IOBuffer> response_buffer_;
   std::string response_data_;
 
   ChromePluginLib* plugin_;
   TestFuncParams::PluginFuncs test_funcs_;
   const TestResponsePayload* expected_payload_;
   scoped_refptr<URLRequestContextGetter> request_context_getter_;
 };
 
 static void STDCALL CPT_Complete(CPRequest* request, bool success,
@@ skipping 47 matching lines @@
 void ChromePluginTest::UnloadPlugin() {
   ChromePluginLib::UnloadAllPlugins();
   plugin_ = NULL;
 }
 
 void ChromePluginTest::RunTest(const GURL& url,
                                const TestResponsePayload* expected_payload) {
   expected_payload_ = expected_payload;
 
   response_data_.clear();
-  request_.reset(new URLRequest(url, this));
+  request_.reset(new net::URLRequest(url, this));
   request_->set_context(new TestURLRequestContext());
   request_->Start();
 
   MessageLoop::current()->Run();
 }
 
-void ChromePluginTest::OnResponseStarted(URLRequest* request) {
+void ChromePluginTest::OnResponseStarted(net::URLRequest* request) {
   DCHECK(request == request_);
 
   int bytes_read = 0;
   if (request_->status().is_success())
     request_->Read(response_buffer_, kResponseBufferSize, &bytes_read);
   OnReadCompleted(request_.get(), bytes_read);
 }
 
-void ChromePluginTest::OnReadCompleted(URLRequest* request, int bytes_read) {
+void ChromePluginTest::OnReadCompleted(net::URLRequest* request,
+                                       int bytes_read) {
   DCHECK(request == request_);
 
   do {
     if (!request_->status().is_success() || bytes_read <= 0)
       break;
     response_data_.append(response_buffer_->data(), bytes_read);
   } while (request_->Read(response_buffer_, kResponseBufferSize, &bytes_read));
 
   if (!request_->status().is_io_pending()) {
     OnURLRequestComplete();
@@ skipping 101 matching lines @@
 TEST_F(ChromePluginTest, DoesNotInterceptOwnRequest) {
   const TestResponsePayload& payload = kChromeTestPluginPayloads[0];
 
   EXPECT_EQ(CPERR_SUCCESS, test_funcs_.test_make_request(
       "GET", GURL(payload.url)));
 
   MessageLoop::current()->Run();
 }
 
 }  // namespace