summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 04:19:30 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 04:19:30 +0000
commit27a112c2e8c464ddd4aed5e1f425204bb3f96d54 (patch)
treea02d4a66a90a040a04aa64cb94948c8e7df59658 /chrome/browser/net
parente79cf09fd1bd403396a65a3c02642b075ec3d1d9 (diff)
downloadchromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.zip
chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.gz
chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.bz2
net: Add namespace net to the remaining files under url_request directory.
It just adds the 'namespace net' to these files and a typedef for them, because there are many entries to fix in one pass. They will be fixed later. BUG=64263 TEST=trybots Review URL: http://codereview.chromium.org/6056007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/chrome_url_request_context.h8
-rw-r--r--chrome/browser/net/connection_tester.h8
-rw-r--r--chrome/browser/net/sdch_dictionary_fetcher.h4
-rw-r--r--chrome/browser/net/websocket_experiment/websocket_experiment_task.cc2
-rw-r--r--chrome/browser/net/websocket_experiment/websocket_experiment_task.h4
5 files changed, 14 insertions, 12 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 8d1377b..93f0e37 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -1,4 +1,4 @@
-// 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.
@@ -45,7 +45,7 @@ class ChromeURLRequestContextFactory;
//
// All methods of this class must be called from the IO thread,
// including the constructor and destructor.
-class ChromeURLRequestContext : public URLRequestContext {
+class ChromeURLRequestContext : public net::URLRequestContext {
public:
ChromeURLRequestContext();
@@ -214,7 +214,7 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
// GetIOMessageLoopProxy however can be called from any thread.
//
// URLRequestContextGetter implementation.
- virtual URLRequestContext* GetURLRequestContext();
+ virtual net::URLRequestContext* GetURLRequestContext();
virtual net::CookieStore* GetCookieStore();
virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
@@ -301,7 +301,7 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
// NULL if not yet initialized. Otherwise, it is the URLRequestContext
// instance that was lazilly created by GetURLRequestContext.
// Access only from the IO thread.
- scoped_refptr<URLRequestContext> url_request_context_;
+ scoped_refptr<net::URLRequestContext> url_request_context_;
DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextGetter);
};
diff --git a/chrome/browser/net/connection_tester.h b/chrome/browser/net/connection_tester.h
index 1d206ac..dd6715d 100644
--- a/chrome/browser/net/connection_tester.h
+++ b/chrome/browser/net/connection_tester.h
@@ -1,4 +1,4 @@
-// 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.
@@ -13,7 +13,9 @@
#include "googleurl/src/gurl.h"
#include "net/base/completion_callback.h"
+namespace net {
class URLRequestContext;
+} // namespace net
// ConnectionTester runs a suite of tests (also called "experiments"),
// to try and discover why loading a particular URL is failing with an error
@@ -126,7 +128,7 @@ class ConnectionTester {
// |delegate| is owned by the caller, and must remain valid for the lifetime
// of ConnectionTester.
ConnectionTester(Delegate* delegate,
- URLRequestContext* proxy_request_context);
+ net::URLRequestContext* proxy_request_context);
// Note that destruction cancels any in-progress tests.
~ConnectionTester();
@@ -172,7 +174,7 @@ class ConnectionTester {
// of the list is the one currently in progress.
ExperimentList remaining_experiments_;
- const scoped_refptr<URLRequestContext> proxy_request_context_;
+ const scoped_refptr<net::URLRequestContext> proxy_request_context_;
DISALLOW_COPY_AND_ASSIGN(ConnectionTester);
};
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h
index 32bf0d7..0240245 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.h
+++ b/chrome/browser/net/sdch_dictionary_fetcher.h
@@ -1,4 +1,4 @@
-// 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.
@@ -52,7 +52,7 @@ class SdchDictionaryFetcher : public URLFetcher::Delegate,
// completes (either successfully or with failure).
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
index f116119..09cccc7 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
@@ -295,7 +295,7 @@ void WebSocketExperimentTask::SaveResult() const {
void WebSocketExperimentTask::OnURLFetchComplete(
const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.h b/chrome/browser/net/websocket_experiment/websocket_experiment_task.h
index c1fe41c..b23c0a0 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.h
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
//
@@ -147,7 +147,7 @@ class WebSocketExperimentTask : public URLFetcher::Delegate,
// URLFetcher::Delegate method.
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);