summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 18:05:41 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 18:05:41 +0000
commitc62dd9d42bd87964a131adc688d0c70f63cc4cac (patch)
treeb57f3bc0843d2acace088498ecb40e0bfc213b6c /net
parentb6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9 (diff)
downloadchromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.zip
chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.gz
chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.bz2
Delete Tracked, and move Location to its own file.
The Birth/Death tracking of tasks has been moved out-of-band into MessageLoop's PendingTask structure. Thus, Task no longer needs to inherit from Tracked. Since Task was the only child of Tracked, delete the Tracked class and move Location to its own file. BUG=none TEST=builds Review URL: http://codereview.chromium.org/7879006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/dnsrr_resolver.cc1
-rw-r--r--net/base/keygen_handler_unittest.cc1
-rw-r--r--net/base/origin_bound_cert_service.cc1
-rw-r--r--net/base/test_root_certs_openssl.cc2
-rw-r--r--net/disk_cache/file_posix.cc1
-rw-r--r--net/disk_cache/in_flight_io.cc1
-rw-r--r--net/dns/watching_file_reader.cc2
-rw-r--r--net/http/http_cache.cc1
-rw-r--r--net/http/http_cache.h1
-rw-r--r--net/proxy/network_delegate_error_observer.cc1
-rw-r--r--net/proxy/polling_proxy_config_service.cc1
-rw-r--r--net/url_request/url_request_context_getter.cc1
12 files changed, 12 insertions, 2 deletions
diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc
index e0d43d9..a38ce40 100644
--- a/net/base/dnsrr_resolver.cc
+++ b/net/base/dnsrr_resolver.cc
@@ -12,6 +12,7 @@
#include <windns.h>
#endif
+#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/message_loop.h"
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index 52c7edf..f926311 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -8,6 +8,7 @@
#include "build/build_config.h"
#include "base/base64.h"
+#include "base/location.h"
#include "base/logging.h"
#include "base/task.h"
#include "base/threading/worker_pool.h"
diff --git a/net/base/origin_bound_cert_service.cc b/net/base/origin_bound_cert_service.cc
index 4f53fc3..8f7c4cb 100644
--- a/net/base/origin_bound_cert_service.cc
+++ b/net/base/origin_bound_cert_service.cc
@@ -7,6 +7,7 @@
#include <limits>
#include "base/compiler_specific.h"
+#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
diff --git a/net/base/test_root_certs_openssl.cc b/net/base/test_root_certs_openssl.cc
index 6016e33..e01d5c9 100644
--- a/net/base/test_root_certs_openssl.cc
+++ b/net/base/test_root_certs_openssl.cc
@@ -7,8 +7,8 @@
#include <openssl/err.h>
#include <openssl/x509v3.h>
+#include "base/location.h"
#include "base/logging.h"
-#include "base/tracked.h"
#include "crypto/openssl_util.h"
#include "net/base/x509_certificate.h"
diff --git a/net/disk_cache/file_posix.cc b/net/disk_cache/file_posix.cc
index b767c17..6785a43 100644
--- a/net/disk_cache/file_posix.cc
+++ b/net/disk_cache/file_posix.cc
@@ -6,6 +6,7 @@
#include <fcntl.h>
+#include "base/location.h"
#include "base/logging.h"
#include "base/threading/worker_pool.h"
#include "net/base/net_errors.h"
diff --git a/net/disk_cache/in_flight_io.cc b/net/disk_cache/in_flight_io.cc
index 6f4b37c..5f0ea02 100644
--- a/net/disk_cache/in_flight_io.cc
+++ b/net/disk_cache/in_flight_io.cc
@@ -4,6 +4,7 @@
#include "net/disk_cache/in_flight_io.h"
+#include "base/location.h"
#include "base/logging.h"
namespace disk_cache {
diff --git a/net/dns/watching_file_reader.cc b/net/dns/watching_file_reader.cc
index 633f3aa..2a550bd 100644
--- a/net/dns/watching_file_reader.cc
+++ b/net/dns/watching_file_reader.cc
@@ -5,6 +5,7 @@
#include "net/dns/watching_file_reader.h"
#include "base/bind.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "base/threading/worker_pool.h"
@@ -134,4 +135,3 @@ void WatchingFileReader::OnReadJobFinished() {
}
} // namespace net
-
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 738a539..91ba1f3 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -14,6 +14,7 @@
#include "base/callback.h"
#include "base/format_macros.h"
+#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
#include "base/pickle.h"
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index e9f0e11..c756185 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -26,6 +26,7 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop_proxy.h"
#include "base/task.h"
+#include "base/time.h"
#include "base/threading/non_thread_safe.h"
#include "net/base/cache_type.h"
#include "net/base/completion_callback.h"
diff --git a/net/proxy/network_delegate_error_observer.cc b/net/proxy/network_delegate_error_observer.cc
index 6ffbe84..d4f6cfb 100644
--- a/net/proxy/network_delegate_error_observer.cc
+++ b/net/proxy/network_delegate_error_observer.cc
@@ -4,6 +4,7 @@
#include "net/proxy/network_delegate_error_observer.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "net/base/net_errors.h"
#include "net/base/network_delegate.h"
diff --git a/net/proxy/polling_proxy_config_service.cc b/net/proxy/polling_proxy_config_service.cc
index 339fda6..e1b921a 100644
--- a/net/proxy/polling_proxy_config_service.cc
+++ b/net/proxy/polling_proxy_config_service.cc
@@ -4,6 +4,7 @@
#include "net/proxy/polling_proxy_config_service.h"
+#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop_proxy.h"
#include "base/observer_list.h"
diff --git a/net/url_request/url_request_context_getter.cc b/net/url_request/url_request_context_getter.cc
index a9790d9..b4ff367 100644
--- a/net/url_request/url_request_context_getter.cc
+++ b/net/url_request/url_request_context_getter.cc
@@ -4,6 +4,7 @@
#include "net/url_request/url_request_context_getter.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "net/url_request/url_request_context.h"