Revert 189829 "[Net] Propagate priority changes from URLRequest ..."

See heapcheck failures:
http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Heapcheck/builds/25563
http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Heapcheck/builds/25563/steps/heapcheck%20test%3A%20net/logs/stdio

Example (one of many):
Leak of 792 bytes in 1 objects allocated from:
	@ 10d675b URLRequestFtpJobPriorityTest
	@ 10d68e7 URLRequestFtpJobPriorityTest_SetPriorityBasic_Test
	@ 10de383 CreateTest

Suppression (error hash=#0A68FF60C5D043B8#):
{
   <insert_a_suppression_name_here>
   Heapcheck:Leak
   fun:URLRequestFtpJobPriorityTest
   fun:URLRequestFtpJobPriorityTest_SetPriorityBasic_Test
   fun:CreateTest
}

> [Net] Propagate priority changes from URLRequest to HttpTransaction
> 
> This is in preparation for propagating priority changes from
> ResourceScheduler all the way to HostResolver and ClientSocketPool.
> 
> Add some NetLog events and parameters for priority.
> 
> BUG=166689
> TBR=simonjam@chromium.org,sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/12701011

TBR=akalin@chromium.org
Review URL: https://codereview.chromium.org/12676022

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

1 files changed, 5 insertions, 12 deletions

diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index a739891..3b053c1 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -9,7 +9,6 @@
 
 #include "base/memory/weak_ptr.h"
 #include "net/base/auth.h"
-#include "net/base/net_export.h"
 #include "net/ftp/ftp_request_info.h"
 #include "net/ftp/ftp_transaction.h"
 #include "net/http/http_request_info.h"
@@ -26,7 +25,7 @@ class FtpAuthCache;
 
 // A URLRequestJob subclass that is built on top of FtpTransaction. It
 // provides an implementation for FTP.
-class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
+class URLRequestFtpJob : public URLRequestJob {
  public:
   URLRequestFtpJob(URLRequest* request,
                    NetworkDelegate* network_delegate,
@@ -38,21 +37,15 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
                                 NetworkDelegate* network_delegate,
                                 const std::string& scheme);
 
- protected:
-  virtual ~URLRequestFtpJob();
-
   // Overridden from URLRequestJob:
   virtual bool IsSafeRedirect(const GURL& location) OVERRIDE;
   virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
   virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE;
   virtual HostPortPair GetSocketAddress() const OVERRIDE;
-  virtual void SetPriority(RequestPriority priority) OVERRIDE;
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
-
-  RequestPriority priority() const { return priority_; }
 
  private:
+  virtual ~URLRequestFtpJob();
+
   void OnResolveProxyComplete(int result);
 
   void StartFtpTransaction();
@@ -67,6 +60,8 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
   void LogFtpServerType(char server_type);
 
   // Overridden from URLRequestJob:
+  virtual void Start() OVERRIDE;
+  virtual void Kill() OVERRIDE;
   virtual LoadState GetLoadState() const OVERRIDE;
   virtual bool NeedsAuth() OVERRIDE;
   virtual void GetAuthChallengeInfo(
@@ -80,8 +75,6 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
                            int buf_size,
                            int *bytes_read) OVERRIDE;
 
-  RequestPriority priority_;
-
   ProxyInfo proxy_info_;
   ProxyService::PacRequest* pac_request_;