net: Remove typedef net::URLRequestContext URLRequestContext;

net/proxy/proxy_script_fetcher_impl.cc

-// Copyright (c) 2010 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 "net/proxy/proxy_script_fetcher_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 51 matching lines @@
   // outside of |charset| (i.e. invalid), then substitute them with
   // U+FFFD rather than failing.
   base::CodepageToUTF16(bytes, codepage,
                         base::OnStringConversionError::SUBSTITUTE,
                         utf16);
 }
 
 }  // namespace
 
 ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
-    URLRequestContext* url_request_context)
+    net::URLRequestContext* url_request_context)

[wtc, 2011/01/15 17:54:23]

Undo the changes to this file (already in the 'net' namespace).

     : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
       url_request_context_(url_request_context),
       buf_(new net::IOBuffer(kBufSize)),
       next_id_(0),
       cur_request_(NULL),
       cur_request_id_(0),
       callback_(NULL),
       result_code_(OK),
       result_text_(NULL),
       max_response_bytes_(kDefaultMaxResponseBytes),
@@ skipping 43 matching lines @@
   cur_request_->Start();
   return ERR_IO_PENDING;
 }
 
 void ProxyScriptFetcherImpl::Cancel() {
   // ResetCurRequestState will free the net::URLRequest, which will cause
   // cancellation.
   ResetCurRequestState();
 }
 
-URLRequestContext* ProxyScriptFetcherImpl::GetRequestContext() {
+net::URLRequestContext* ProxyScriptFetcherImpl::GetRequestContext() {
   return url_request_context_;
 }
 
 void ProxyScriptFetcherImpl::OnAuthRequired(net::URLRequest* request,
                                             AuthChallengeInfo* auth_info) {
   DCHECK_EQ(request, cur_request_.get());
   // TODO(eroman):
   LOG(WARNING) << "Auth required to fetch PAC script, aborting.";
   result_code_ = ERR_NOT_IMPLEMENTED;
   request->CancelAuth();
@@ skipping 105 matching lines @@
     cur_request_->GetCharset(&charset);
     ConvertResponseToUTF16(charset, bytes_read_so_far_, result_text_);
   } else {
     // On error, the caller expects empty string for bytes.
     result_text_->clear();
   }
 
   int result_code = result_code_;
   CompletionCallback* callback = callback_;
 
-  // Hold a reference to the URLRequestContext to prevent re-entrancy from
-  // ~URLRequestContext.
-  scoped_refptr<URLRequestContext> context(cur_request_->context());
+  // Hold a reference to the net::URLRequestContext to prevent re-entrancy from
+  // ~net::URLRequestContext.
+  scoped_refptr<net::URLRequestContext> context(cur_request_->context());
   ResetCurRequestState();
 
   callback->Run(result_code);
 }
 
 void ProxyScriptFetcherImpl::ResetCurRequestState() {
   cur_request_.reset();
   cur_request_id_ = 0;
   callback_ = NULL;
   result_code_ = OK;
@@ skipping 18 matching lines @@
   return prev;
 }
 
 size_t ProxyScriptFetcherImpl::SetSizeConstraint(size_t size_bytes) {
   size_t prev = max_response_bytes_;
   max_response_bytes_ = size_bytes;
   return prev;
 }
 
 }  // namespace net