Move more net classes into the net namespace. Also remove the net_util namespace in favor of the net namespace.

This is a purely mechanical change.  There should be no logic changes.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/automation/url_request_mock_http_job.cc b/chrome/browser/automation/url_request_mock_http_job.cc
index 5df0ed7..0c3cbc7 100644
--- a/chrome/browser/automation/url_request_mock_http_job.cc
+++ b/chrome/browser/automation/url_request_mock_http_job.cc
@@ -59,7 +59,7 @@ URLRequestJob* URLRequestMockHTTPJob::Factory(URLRequest* request,
 
   // Convert the file:/// URL to a path on disk.
   std::wstring file_path;
-  net_util::FileURLToFilePath(GURL(file_url), &file_path);
+  net::FileURLToFilePath(GURL(file_url), &file_path);
   URLRequestMockHTTPJob* job = new URLRequestMockHTTPJob(request);
   job->file_path_ = file_path;
   return job;
diff --git a/chrome/browser/automation/url_request_mock_net_error_job.cc b/chrome/browser/automation/url_request_mock_net_error_job.cc
index 06adfb7..18ede31 100644
--- a/chrome/browser/automation/url_request_mock_net_error_job.cc
+++ b/chrome/browser/automation/url_request_mock_net_error_job.cc
@@ -43,7 +43,7 @@ URLRequestMockNetErrorJob::URLMockInfoMap
 void URLRequestMockNetErrorJob::AddMockedURL(const GURL& url,
                                              const std::wstring& base,
                                              const std::vector<int>& errors,
-                                             X509Certificate* ssl_cert) {
+                                             net::X509Certificate* ssl_cert) {
 #ifndef NDEBUG
   URLMockInfoMap::const_iterator iter = url_mock_info_map_.find(url);
   DCHECK(iter == url_mock_info_map_.end());
@@ -83,13 +83,13 @@ URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
   file_url.append(UTF8ToWide(url.path()));
   // Convert the file:/// URL to a path on disk.
   std::wstring file_path;
-  net_util::FileURLToFilePath(GURL(file_url), &file_path);
+  net::FileURLToFilePath(GURL(file_url), &file_path);
   job->file_path_ = file_path;
   return job;
 }
 
 URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(URLRequest* request,
-    const std::vector<int>& errors, X509Certificate* cert)
+    const std::vector<int>& errors, net::X509Certificate* cert)
     : URLRequestMockHTTPJob(request),
       errors_(errors),
       ssl_cert_(cert) {
diff --git a/chrome/browser/automation/url_request_mock_net_error_job.h b/chrome/browser/automation/url_request_mock_net_error_job.h
index bee1c31..d7abad0 100644
--- a/chrome/browser/automation/url_request_mock_net_error_job.h
+++ b/chrome/browser/automation/url_request_mock_net_error_job.h
@@ -41,7 +41,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
  public:
   URLRequestMockNetErrorJob(URLRequest* request,
                             const std::vector<int>& errors,
-                            X509Certificate* ssl_cert);
+                            net::X509Certificate* ssl_cert);
   virtual ~URLRequestMockNetErrorJob();
 
   virtual void Start();
@@ -56,7 +56,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   static void AddMockedURL(const GURL& url,
                            const std::wstring& base,
                            const std::vector<int>& errors,
-                           X509Certificate* ssl_cert);
+                           net::X509Certificate* ssl_cert);
 
   // Removes the specified |url| from the list of mocked urls.
   static void RemoveMockedURL(const GURL& url);
@@ -66,14 +66,14 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
     MockInfo() : ssl_cert(NULL) { }
     MockInfo(std::wstring base,
              std::vector<int> errors,
-             X509Certificate* ssl_cert)
+             net::X509Certificate* ssl_cert)
         : base(base),
           errors(errors),
           ssl_cert(ssl_cert) { }
 
     std::wstring base;
     std::vector<int> errors;
-    scoped_refptr<X509Certificate> ssl_cert;
+    scoped_refptr<net::X509Certificate> ssl_cert;
   };
 
   static URLRequest::ProtocolFactory Factory;
@@ -84,7 +84,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   std::vector<int> errors_;
 
   // The certificate to use for SSL errors.
-  scoped_refptr<X509Certificate> ssl_cert_;
+  scoped_refptr<net::X509Certificate> ssl_cert_;
 
   typedef std::map<GURL, MockInfo> URLMockInfoMap;
   static URLMockInfoMap url_mock_info_map_;