summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authordsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-27 20:43:33 +0000
committerdsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-27 20:43:33 +0000
commite1acf6f902e50222baf99bfb492ecc38a1604975 (patch)
tree503d45705b14be7e2f1ed86c71d6064abbf90fbe /net/url_request
parenta2f5993e1ce940e8a8eec900abaeed02e2eee09b (diff)
downloadchromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.zip
chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.gz
chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.bz2
Move Time, TimeDelta and TimeTicks into namespace base.
Review URL: http://codereview.chromium.org/7995 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request.cc2
-rw-r--r--net/url_request/url_request.h4
-rw-r--r--net/url_request/url_request_job.cc4
-rw-r--r--net/url_request/url_request_job_metrics.cc2
-rw-r--r--net/url_request/url_request_job_metrics.h4
-rw-r--r--net/url_request/url_request_unittest.cc2
6 files changed, 12 insertions, 6 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 8c6d5f3..22372db 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -20,6 +20,7 @@
URLRequestMetrics url_request_metrics;
#endif
+using base::Time;
using net::UploadData;
using std::string;
using std::wstring;
@@ -335,4 +336,3 @@ int64 URLRequest::GetExpectedContentSize() const {
return expected_content_size;
}
-
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 549665f..1f5a06e 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -286,13 +286,13 @@ class URLRequest {
// The time at which the returned response was requested. For cached
// responses, this may be a time well in the past.
- const Time& request_time() const {
+ const base::Time& request_time() const {
return response_info_.request_time;
}
// The time at which the returned response was generated. For cached
// responses, this may be a time well in the past.
- const Time& response_time() const {
+ const base::Time& response_time() const {
return response_info_.response_time;
}
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 10323f6..dc372ba 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -13,6 +13,9 @@
#include "net/url_request/url_request_job_metrics.h"
#include "net/url_request/url_request_job_tracker.h"
+using base::Time;
+using base::TimeTicks;
+
// Buffer size allocated when de-compressing data.
static const int kFilterBufSize = 32 * 1024;
@@ -498,4 +501,3 @@ void URLRequestJob::SetStatus(const URLRequestStatus &status) {
if (request_)
request_->set_status(status);
}
-
diff --git a/net/url_request/url_request_job_metrics.cc b/net/url_request/url_request_job_metrics.cc
index ecb717f..8db26fb 100644
--- a/net/url_request/url_request_job_metrics.cc
+++ b/net/url_request/url_request_job_metrics.cc
@@ -7,6 +7,8 @@
#include "base/basictypes.h"
#include "base/string_util.h"
+using base::TimeDelta;
+
void URLRequestJobMetrics::AppendText(std::wstring* text) {
if (!text)
return;
diff --git a/net/url_request/url_request_job_metrics.h b/net/url_request/url_request_job_metrics.h
index 950d0ae..5e6de7f 100644
--- a/net/url_request/url_request_job_metrics.h
+++ b/net/url_request/url_request_job_metrics.h
@@ -28,10 +28,10 @@ class URLRequestJobMetrics {
scoped_ptr<GURL> url_;
// Time when the job starts.
- TimeTicks start_time_;
+ base::TimeTicks start_time_;
// Time when the job is done.
- TimeTicks end_time_;
+ base::TimeTicks end_time_;
// Total number of bytes the job reads from underline IO.
int total_bytes_read_;
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 9bf467f..cd21a2d 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -26,6 +26,8 @@
#include "net/url_request/url_request.h"
#include "testing/gtest/include/gtest/gtest.h"
+using base::Time;
+
namespace {
class URLRequestTest : public testing::Test {