summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/chrome_network_delegate.cc4
-rw-r--r--chrome/browser/net/chrome_network_delegate.h4
-rw-r--r--chrome/browser/net/network_stats.cc6
-rw-r--r--chrome/browser/net/network_stats.h14
-rw-r--r--chrome/browser/net/network_stats_unittest.cc4
-rw-r--r--chrome/browser/net/predictor.cc2
-rw-r--r--chrome/browser/net/view_http_cache_job_factory.cc2
7 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 681799a..721ff38 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -73,7 +73,7 @@ void ChromeNetworkDelegate::InitializeReferrersEnabled(
int ChromeNetworkDelegate::OnBeforeURLRequest(
net::URLRequest* request,
- net::CompletionCallback* callback,
+ net::OldCompletionCallback* callback,
GURL* new_url) {
#if defined(ENABLE_CONFIGURATION_POLICY)
// TODO(joaodasilva): This prevents extensions from seeing URLs that are
@@ -98,7 +98,7 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
int ChromeNetworkDelegate::OnBeforeSendHeaders(
net::URLRequest* request,
- net::CompletionCallback* callback,
+ net::OldCompletionCallback* callback,
net::HttpRequestHeaders* headers) {
return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
profile_, extension_info_map_.get(), request, callback, headers);
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
index f36df17..1a76935 100644
--- a/chrome/browser/net/chrome_network_delegate.h
+++ b/chrome/browser/net/chrome_network_delegate.h
@@ -47,10 +47,10 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
private:
// NetworkDelegate methods:
virtual int OnBeforeURLRequest(net::URLRequest* request,
- net::CompletionCallback* callback,
+ net::OldCompletionCallback* callback,
GURL* new_url) OVERRIDE;
virtual int OnBeforeSendHeaders(net::URLRequest* request,
- net::CompletionCallback* callback,
+ net::OldCompletionCallback* callback,
net::HttpRequestHeaders* headers) OVERRIDE;
virtual void OnSendHeaders(net::URLRequest* request,
const net::HttpRequestHeaders& headers) OVERRIDE;
diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc
index 6b600b2..036b3708 100644
--- a/chrome/browser/net/network_stats.cc
+++ b/chrome/browser/net/network_stats.cc
@@ -97,7 +97,7 @@ NetworkStats::~NetworkStats() {
bool NetworkStats::Start(net::HostResolver* host_resolver,
const net::HostPortPair& server_host_port_pair,
uint32 bytes_to_send,
- net::CompletionCallback* finished_callback) {
+ net::OldCompletionCallback* finished_callback) {
DCHECK(bytes_to_send); // We should have data to send.
Initialize(bytes_to_send, finished_callback);
@@ -114,7 +114,7 @@ bool NetworkStats::Start(net::HostResolver* host_resolver,
}
void NetworkStats::Initialize(uint32 bytes_to_send,
- net::CompletionCallback* finished_callback) {
+ net::OldCompletionCallback* finished_callback) {
DCHECK(bytes_to_send); // We should have data to send.
load_size_ = bytes_to_send;
@@ -156,7 +156,7 @@ bool NetworkStats::ConnectComplete(int result) {
void NetworkStats::DoFinishCallback(int result) {
if (finished_callback_ != NULL) {
- net::CompletionCallback* callback = finished_callback_;
+ net::OldCompletionCallback* callback = finished_callback_;
finished_callback_ = NULL;
callback->Run(result);
}
diff --git a/chrome/browser/net/network_stats.h b/chrome/browser/net/network_stats.h
index 59106d2..65742b6 100644
--- a/chrome/browser/net/network_stats.h
+++ b/chrome/browser/net/network_stats.h
@@ -74,7 +74,7 @@ class NetworkStats {
bool Start(net::HostResolver* host_resolver,
const net::HostPortPair& server,
uint32 bytes_to_send,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
protected:
// Constructs an NetworkStats object that collects metrics for network
@@ -86,7 +86,7 @@ class NetworkStats {
// server. |finished_callback| is called when we are done with the test.
// |finished_callback| is mainly useful for unittests.
void Initialize(uint32 bytes_to_send,
- net::CompletionCallback* finished_callback);
+ net::OldCompletionCallback* finished_callback);
// Called after host is resolved. UDPStatsClient and TCPStatsClient implement
// this method. They create the socket and connect to the server.
@@ -177,18 +177,18 @@ class NetworkStats {
net::AddressList addresses_;
// Callback to call when host resolution is completed.
- net::CompletionCallbackImpl<NetworkStats> resolve_callback_;
+ net::OldCompletionCallbackImpl<NetworkStats> resolve_callback_;
// Callback to call when data is read from the server.
- net::CompletionCallbackImpl<NetworkStats> read_callback_;
+ net::OldCompletionCallbackImpl<NetworkStats> read_callback_;
// Callback to call when data is sent to the server.
- net::CompletionCallbackImpl<NetworkStats> write_callback_;
+ net::OldCompletionCallbackImpl<NetworkStats> write_callback_;
// Callback to call when echo protocol is successefully finished or whenever
// there is an error (this allows unittests to wait until echo protocol's
// round trip is finished).
- net::CompletionCallback* finished_callback_;
+ net::OldCompletionCallback* finished_callback_;
// The time when the session was started.
base::TimeTicks start_time_;
@@ -252,7 +252,7 @@ class TCPStatsClient : public NetworkStats {
void OnConnectComplete(int result);
// Callback to call when connect is completed.
- net::CompletionCallbackImpl<TCPStatsClient> connect_callback_;
+ net::OldCompletionCallbackImpl<TCPStatsClient> connect_callback_;
};
// This collects the network connectivity stats for UDP and TCP for small
diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc
index 260e24a..a956d08 100644
--- a/chrome/browser/net/network_stats_unittest.cc
+++ b/chrome/browser/net/network_stats_unittest.cc
@@ -34,7 +34,7 @@ class NetworkStatsTestUDP : public NetworkStatsTest {
protected:
void RunUDPEchoTest(int bytes) {
- TestCompletionCallback cb;
+ TestOldCompletionCallback cb;
scoped_ptr<net::MockHostResolver> host_resolver(
new net::MockHostResolver());
@@ -61,7 +61,7 @@ class NetworkStatsTestTCP : public NetworkStatsTest {
protected:
void RunTCPEchoTest(int bytes) {
- TestCompletionCallback cb;
+ TestOldCompletionCallback cb;
scoped_ptr<net::MockHostResolver> host_resolver(
new net::MockHostResolver());
diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index ed4aa4b..20fa822 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -110,7 +110,7 @@ class Predictor::LookupRequest {
}
// HostResolver will call us using this callback when resolution is complete.
- net::CompletionCallbackImpl<LookupRequest> net_callback_;
+ net::OldCompletionCallbackImpl<LookupRequest> net_callback_;
Predictor* predictor_; // The predictor which started us.
diff --git a/chrome/browser/net/view_http_cache_job_factory.cc b/chrome/browser/net/view_http_cache_job_factory.cc
index 1c4437b..1441dd7 100644
--- a/chrome/browser/net/view_http_cache_job_factory.cc
+++ b/chrome/browser/net/view_http_cache_job_factory.cc
@@ -71,7 +71,7 @@ class ViewHttpCacheJob : public net::URLRequestJob {
std::string data_;
int data_offset_;
net::ViewCacheHelper cache_helper_;
- net::CompletionCallbackImpl<Core> callback_;
+ net::OldCompletionCallbackImpl<Core> callback_;
Callback0::Type* user_callback_;
DISALLOW_COPY_AND_ASSIGN(Core);
generated by cgit v1.1 at 2025-03-10 14:41:32 +0000