Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5139006

TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/5270010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67674 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 12 deletions

diff --git a/net/url_request/https_prober.h b/net/url_request/https_prober.h
index 1bc90c9..28182c4 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_URL_REQUEST_HTTPS_PROBER_H_
-#define NET_URL_REQUEST_HTTPS_PROBER_H_
+#ifndef NET_BASE_HTTPS_PROBER_H_
+#define NET_BASE_HTTPS_PROBER_H_
 #pragma once
 
 #include <map>
@@ -11,6 +11,7 @@
 #include <string>
 
 #include "base/singleton.h"
+#include "base/task.h"
 #include "net/url_request/url_request.h"
 
 class URLRequestContext;
@@ -73,4 +74,4 @@ class HTTPSProber : public URLRequest::Delegate {
 };
 
 }  // namespace net
-#endif  // NET_URL_REQUEST_HTTPS_PROBER_H_
+#endif
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 1726051..ac54a1f 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -5,7 +5,6 @@
 #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"
@@ -589,12 +588,6 @@ 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 4abc1b1..fb81500 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,7 +535,11 @@ class URLRequest : public NonThreadSafe {
 
   // Returns the priority level for this request.
   net::RequestPriority priority() const { return priority_; }
-  void set_priority(net::RequestPriority priority);
+  void set_priority(net::RequestPriority priority) {
+    DCHECK_GE(priority, net::HIGHEST);
+    DCHECK_LT(priority, net::NUM_PRIORITIES);
+    priority_ = priority;
+  }
 
 #ifdef UNIT_TEST
   URLRequestJob* job() { return job_; }