Revert "FBTF: Another big ctor/dtor cleanup found by automated tools."

This reverts commit 27ea47d65cf8767f350113d5ad9e25170efde811 (r61237).

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/3609005

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

2 files changed, 25 insertions, 44 deletions

diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc
index 0913015..c8849a5 100644
--- a/net/socket_stream/socket_stream_job.cc
+++ b/net/socket_stream/socket_stream_job.cc
@@ -24,38 +24,4 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
   return GetJobManager()->CreateJob(url, delegate);
 }
 
-SocketStreamJob::SocketStreamJob() {}
-
-SocketStream::UserData* SocketStreamJob::GetUserData(const void* key) const {
-  return socket_->GetUserData(key);
-}
-
-void SocketStreamJob::SetUserData(const void* key,
-                                  SocketStream::UserData* data) {
-  socket_->SetUserData(key, data);
-}
-
-void SocketStreamJob::Connect() {
-  socket_->Connect();
-}
-
-bool SocketStreamJob::SendData(const char* data, int len) {
-  return socket_->SendData(data, len);
-}
-
-void SocketStreamJob::Close() {
-  socket_->Close();
-}
-
-void SocketStreamJob::RestartWithAuth(const string16& username,
-                                      const string16& password) {
-  socket_->RestartWithAuth(username, password);
-}
-
-void SocketStreamJob::DetachDelegate() {
-  socket_->DetachDelegate();
-}
-
-SocketStreamJob::~SocketStreamJob() {}
-
 }  // namespace net
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index a301709..89e0c36 100644
--- a/net/socket_stream/socket_stream_job.h
+++ b/net/socket_stream/socket_stream_job.h
@@ -34,13 +34,17 @@ class SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> {
   static SocketStreamJob* CreateSocketStreamJob(
       const GURL& url, SocketStream::Delegate* delegate);
 
-  SocketStreamJob();
+  SocketStreamJob() {}
   void InitSocketStream(SocketStream* socket) {
     socket_ = socket;
   }
 
-  virtual SocketStream::UserData* GetUserData(const void* key) const;
-  virtual void SetUserData(const void* key, SocketStream::UserData* data);
+  virtual SocketStream::UserData *GetUserData(const void* key) const {
+    return socket_->GetUserData(key);
+  }
+  virtual void SetUserData(const void* key, SocketStream::UserData* data) {
+    socket_->SetUserData(key, data);
+  }
 
   URLRequestContext* context() const {
     return socket_->context();
@@ -49,20 +53,31 @@ class SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> {
     socket_->set_context(context);
   }
 
-  virtual void Connect();
+  virtual void Connect() {
+    socket_->Connect();
+  }
 
-  virtual bool SendData(const char* data, int len);
+  virtual bool SendData(const char* data, int len) {
+    return socket_->SendData(data, len);
+  }
 
-  virtual void Close();
+  virtual void Close() {
+    socket_->Close();
+  }
 
-  virtual void RestartWithAuth(const string16& username,
-                               const string16& password);
+  virtual void RestartWithAuth(
+      const string16& username,
+      const string16& password) {
+    socket_->RestartWithAuth(username, password);
+  }
 
-  virtual void DetachDelegate();
+  virtual void DetachDelegate() {
+    socket_->DetachDelegate();
+  }
 
  protected:
   friend class base::RefCountedThreadSafe<SocketStreamJob>;
-  virtual ~SocketStreamJob();
+  virtual ~SocketStreamJob() {}
 
   scoped_refptr<SocketStream> socket_;