net: Add namespace net to the remaining files under url_request directory.

net/url_request/url_request_test_job.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 <vector>
 
 #include "net/url_request/url_request_test_job.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 
 // This emulates the global message loop for the test URL request class, since
 // this is only test code, it's probably not too dangerous to have this static
 // object.
 static std::vector< scoped_refptr<URLRequestTestJob> > pending_jobs;

[wtc, 2011/01/05 00:19:41]

Nit: add a g_ prefix to the 'pending_jobs' variable name?

[tfarina, 2011/01/05 01:09:59]

Done.

 
+namespace net {
+
 // static getters for known URLs
 GURL URLRequestTestJob::test_url_1() {
   return GURL("test:url1");
 }
 GURL URLRequestTestJob::test_url_2() {
   return GURL("test:url2");
 }
 GURL URLRequestTestJob::test_url_3() {
   return GURL("test:url3");
 }
@@ skipping 32 matching lines @@
 
 // static getter for error response headers
 std::string URLRequestTestJob::test_error_headers() {
   const char headers[] =
       "HTTP/1.1 500 BOO HOO\0"
       "\0";
   return std::string(headers, arraysize(headers));
 }
 
 // static
-net::URLRequestJob* URLRequestTestJob::Factory(net::URLRequest* request,
-                                               const std::string& scheme) {
+URLRequestJob* URLRequestTestJob::Factory(URLRequest* request,
+                                          const std::string& scheme) {
   return new URLRequestTestJob(request);
 }
 
-URLRequestTestJob::URLRequestTestJob(net::URLRequest* request)
-    : net::URLRequestJob(request),
+URLRequestTestJob::URLRequestTestJob(URLRequest* request)
+    : URLRequestJob(request),
       auto_advance_(false),
       stage_(WAITING),
       offset_(0),
       async_buf_(NULL),
       async_buf_size_(0) {
 }
 
-URLRequestTestJob::URLRequestTestJob(net::URLRequest* request,
+URLRequestTestJob::URLRequestTestJob(URLRequest* request,
                                      bool auto_advance)
-    : net::URLRequestJob(request),
+    : URLRequestJob(request),
       auto_advance_(auto_advance),
       stage_(WAITING),
       offset_(0),
       async_buf_(NULL),
       async_buf_size_(0) {
 }
 
-URLRequestTestJob::URLRequestTestJob(net::URLRequest* request,
+URLRequestTestJob::URLRequestTestJob(URLRequest* request,
                                      const std::string& response_headers,
                                      const std::string& response_data,
                                      bool auto_advance)
-    : net::URLRequestJob(request),
+    : URLRequestJob(request),
       auto_advance_(auto_advance),
       stage_(WAITING),
-      response_headers_(new net::HttpResponseHeaders(response_headers)),
+      response_headers_(new HttpResponseHeaders(response_headers)),
       response_data_(response_data),
       offset_(0),
       async_buf_(NULL),
       async_buf_size_(0) {
 }
 
 URLRequestTestJob::~URLRequestTestJob() {
 }
 
 bool URLRequestTestJob::GetMimeType(std::string* mime_type) const {
   DCHECK(mime_type);
   if (!response_headers_)
     return false;
   return response_headers_->GetMimeType(mime_type);
 }
 
 void URLRequestTestJob::Start() {
   // Start reading asynchronously so that all error reporting and data
   // callbacks happen as they would for network requests.
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
        this, &URLRequestTestJob::StartAsync));
 }
 
 void URLRequestTestJob::StartAsync() {
   if (!response_headers_) {
-    response_headers_ = new net::HttpResponseHeaders(test_headers());
+    response_headers_ = new HttpResponseHeaders(test_headers());
     if (request_->url().spec() == test_url_1().spec()) {
       response_data_ = test_data_1();
       stage_ = DATA_AVAILABLE;  // Simulate a synchronous response for this one.
     } else if (request_->url().spec() == test_url_2().spec()) {
       response_data_ = test_data_2();
     } else if (request_->url().spec() == test_url_3().spec()) {
       response_data_ = test_data_3();
     } else {
       // unexpected url, return error
       // FIXME(brettw) we may want to use WININET errors or have some more types
       // of errors
       NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
-                                  net::ERR_INVALID_URL));
+                                  ERR_INVALID_URL));
       // FIXME(brettw): this should emulate a network error, and not just fail
       // initiating a connection
       return;
     }
   }
 
   AdvanceJob();
 
   this->NotifyHeadersComplete();
 }
 
-bool URLRequestTestJob::ReadRawData(net::IOBuffer* buf, int buf_size,
+bool URLRequestTestJob::ReadRawData(IOBuffer* buf, int buf_size,
                                     int *bytes_read) {
   if (stage_ == WAITING) {
     async_buf_ = buf;
     async_buf_size_ = buf_size;
     SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
     return false;
   }
 
   DCHECK(bytes_read);
   *bytes_read = 0;
 
   if (offset_ >= static_cast<int>(response_data_.length())) {
     return true;  // done reading
   }
 
   int to_read = buf_size;
   if (to_read + offset_ > static_cast<int>(response_data_.length()))
     to_read = static_cast<int>(response_data_.length()) - offset_;
 
   memcpy(buf->data(), &response_data_.c_str()[offset_], to_read);
   offset_ += to_read;
 
   *bytes_read = to_read;
   return true;
 }
 
-void URLRequestTestJob::GetResponseInfo(net::HttpResponseInfo* info) {
+void URLRequestTestJob::GetResponseInfo(HttpResponseInfo* info) {
   if (response_headers_)
     info->headers = response_headers_;
 }
 
 int URLRequestTestJob::GetResponseCode() const {
   if (response_headers_)
     return response_headers_->response_code();
   return -1;
 }
 
 bool URLRequestTestJob::IsRedirectResponse(GURL* location,
                                            int* http_status_code) {
   if (!response_headers_)
     return false;
 
   std::string value;
   if (!response_headers_->IsRedirect(&value))
     return false;
 
   *location = request_->url().Resolve(value);
   *http_status_code = response_headers_->response_code();
   return true;
 }
 
 
 void URLRequestTestJob::Kill() {
   stage_ = DONE;
-  net::URLRequestJob::Kill();
+  URLRequestJob::Kill();
 }
 
 void URLRequestTestJob::ProcessNextOperation() {
   switch (stage_) {
     case WAITING:
       stage_ = DATA_AVAILABLE;
       // OK if ReadRawData wasn't called yet.
       if (async_buf_) {
         int bytes_read;
         if (!ReadRawData(async_buf_, async_buf_size_, &bytes_read))
@@ skipping 31 matching lines @@
   if (pending_jobs.empty())
     return false;
 
   scoped_refptr<URLRequestTestJob> next_job(pending_jobs[0]);
   pending_jobs.erase(pending_jobs.begin());
 
   DCHECK(!next_job->auto_advance());  // auto_advance jobs should be in this q
   next_job->ProcessNextOperation();
   return true;
 }
+
+}  // namespace net