Reapply r61237: FBTF: Another big ctor/dtor cleanup found by automated tools.

Removes changes to code in webkit/ that broke chrome_frame. Will debug that portion later.

(Shaves ~2MB off Linux Debug .a files)

BUG=none
TEST=compiles

First Review URL: http://codereview.chromium.org/3563004

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

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

2 files changed, 44 insertions, 25 deletions

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