summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 03:04:46 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 03:04:46 +0000
commit381bc458bfc58a239f3dfe69b008c6d3522869a2 (patch)
tree47d1ce68c60dbf2590e92c5fcf8ad4954a42aa12 /net/url_request
parent7781bb91a12839e409b9904c06d8f9072d1a3ae8 (diff)
downloadchromium_src-381bc458bfc58a239f3dfe69b008c6d3522869a2.zip
chromium_src-381bc458bfc58a239f3dfe69b008c6d3522869a2.tar.gz
chromium_src-381bc458bfc58a239f3dfe69b008c6d3522869a2.tar.bz2
FBTF: Remove unneeded headers from base/ (part 10)
BUG=none TEST=none Review URL: http://codereview.chromium.org/5139006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/https_prober.h7
-rw-r--r--net/url_request/url_request.cc7
-rw-r--r--net/url_request/url_request.h8
3 files changed, 12 insertions, 10 deletions
diff --git a/net/url_request/https_prober.h b/net/url_request/https_prober.h
index 28182c4..1bc90c9 100644
--- a/net/url_request/https_prober.h
+++ b/net/url_request/https_prober.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef NET_BASE_HTTPS_PROBER_H_
-#define NET_BASE_HTTPS_PROBER_H_
+#ifndef NET_URL_REQUEST_HTTPS_PROBER_H_
+#define NET_URL_REQUEST_HTTPS_PROBER_H_
#pragma once
#include <map>
@@ -11,7 +11,6 @@
#include <string>
#include "base/singleton.h"
-#include "base/task.h"
#include "net/url_request/url_request.h"
class URLRequestContext;
@@ -74,4 +73,4 @@ class HTTPSProber : public URLRequest::Delegate {
};
} // namespace net
-#endif
+#endif // NET_URL_REQUEST_HTTPS_PROBER_H_
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index ac54a1f..1726051 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -5,6 +5,7 @@
#include "net/url_request/url_request.h"
#include "base/compiler_specific.h"
+#include "base/logging.h"
#include "base/message_loop.h"
#include "base/metrics/stats_counters.h"
#include "base/singleton.h"
@@ -588,6 +589,12 @@ int64 URLRequest::GetExpectedContentSize() const {
return expected_content_size;
}
+void URLRequest::set_priority(net::RequestPriority priority) {
+ DCHECK_GE(priority, net::HIGHEST);
+ DCHECK_LT(priority, net::NUM_PRIORITIES);
+ priority_ = priority;
+}
+
URLRequest::UserData* URLRequest::GetUserData(const void* key) const {
UserDataMap::const_iterator found = user_data_.find(key);
if (found != user_data_.end())
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index fb81500..4abc1b1 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -10,9 +10,9 @@
#include <string>
#include <vector>
+#include "base/basictypes.h"
#include "base/debug/leak_tracker.h"
#include "base/linked_ptr.h"
-#include "base/logging.h"
#include "base/non_thread_safe.h"
#include "base/ref_counted.h"
#include "base/string16.h"
@@ -535,11 +535,7 @@ class URLRequest : public NonThreadSafe {
// Returns the priority level for this request.
net::RequestPriority priority() const { return priority_; }
- void set_priority(net::RequestPriority priority) {
- DCHECK_GE(priority, net::HIGHEST);
- DCHECK_LT(priority, net::NUM_PRIORITIES);
- priority_ = priority;
- }
+ void set_priority(net::RequestPriority priority);
#ifdef UNIT_TEST
URLRequestJob* job() { return job_; }