net: Remove typedef net::URLRequestContext URLRequestContext;

chrome/browser/net/connection_tester.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 "chrome/browser/net/connection_tester.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 19 matching lines @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 namespace {
 
 // ExperimentURLRequestContext ------------------------------------------------
 
 // An instance of ExperimentURLRequestContext is created for each experiment
 // run by ConnectionTester. The class initializes network dependencies according
 // to the specified "experiment".
-class ExperimentURLRequestContext : public URLRequestContext {
+class ExperimentURLRequestContext : public net::URLRequestContext {
  public:
-  explicit ExperimentURLRequestContext(URLRequestContext* proxy_request_context)
+  explicit ExperimentURLRequestContext(
+      net::URLRequestContext* proxy_request_context)
       : proxy_request_context_(proxy_request_context) {}
 
   int Init(const ConnectionTester::Experiment& experiment) {
     int rv;
 
     // Create a custom HostResolver for this experiment.
     rv = CreateHostResolver(experiment.host_resolver_experiment,
                             &host_resolver_);
     if (rv != net::OK)
       return rv;  // Failure.
@@ skipping 162 matching lines @@
 
     net::ProxyConfig config;
     if (firefox_settings.ToProxyConfig(&config)) {
       config_service->reset(new net::ProxyConfigServiceFixed(config));
       return net::OK;
     }
 
     return net::ERR_FAILED;
   }
 
-  const scoped_refptr<URLRequestContext> proxy_request_context_;
+  const scoped_refptr<net::URLRequestContext> proxy_request_context_;
 };
 
 }  // namespace
 
 // ConnectionTester::TestRunner ----------------------------------------------
 
 // TestRunner is a helper class for running an individual experiment. It can
 // be deleted any time after it is started, and this will abort the request.
 class ConnectionTester::TestRunner : public net::URLRequest::Delegate {
  public:
@@ skipping 65 matching lines @@
     net::URLRequest* request) {
   int result = net::OK;
   if (!request->status().is_success()) {
     DCHECK_NE(net::ERR_IO_PENDING, request->status().os_error());
     result = request->status().os_error();
   }
   tester_->OnExperimentCompleted(result);
 }
 
 void ConnectionTester::TestRunner::Run(const Experiment& experiment) {
-  // Try to create a URLRequestContext for this experiment.
+  // Try to create a net::URLRequestContext for this experiment.
   scoped_refptr<ExperimentURLRequestContext> context(
       new ExperimentURLRequestContext(tester_->proxy_request_context_));
   int rv = context->Init(experiment);
   if (rv != net::OK) {
     // Complete the experiment with a failure.
     tester_->OnExperimentCompleted(rv);
     return;
   }
 
   // Fetch a request using the experimental context.
   request_.reset(new net::URLRequest(experiment.url, this));
   request_->set_context(context);
   request_->Start();
 }
 
 // ConnectionTester ----------------------------------------------------------
 
-ConnectionTester::ConnectionTester(Delegate* delegate,
-                                   URLRequestContext* proxy_request_context)
+ConnectionTester::ConnectionTester(
+    Delegate* delegate,
+    net::URLRequestContext* proxy_request_context)
     : delegate_(delegate), proxy_request_context_(proxy_request_context) {
   DCHECK(delegate);
   DCHECK(proxy_request_context);
 }
 
 ConnectionTester::~ConnectionTester() {
   // Cancellation happens automatically by deleting test_runner_.
 }
 
 void ConnectionTester::RunAllTests(const GURL& url) {
@@ skipping 80 matching lines @@
 
   // Notify the delegate of completion.
   delegate_->OnCompletedConnectionTestExperiment(current, result);
 
   if (remaining_experiments_.empty()) {
     delegate_->OnCompletedConnectionTestSuite();
   } else {
     StartNextExperiment();
   }
 }