FBTF: Even more ctor/virtual deinlining.

(Only 424k off Linux debug .a files).

BUG=none
TEST=compiles

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

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

2 files changed, 51 insertions, 11 deletions

diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 72126f1..9854cc5 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -543,6 +543,29 @@ bool MockSSLClientSocket::set_was_npn_negotiated(bool negotiated) {
   return new_npn_value_ = negotiated;
 }
 
+StaticSocketDataProvider::StaticSocketDataProvider()
+    : reads_(NULL),
+      read_index_(0),
+      read_count_(0),
+      writes_(NULL),
+      write_index_(0),
+      write_count_(0) {
+}
+
+StaticSocketDataProvider::StaticSocketDataProvider(MockRead* reads,
+                                                   size_t reads_count,
+                                                   MockWrite* writes,
+                                                   size_t writes_count)
+    : reads_(reads),
+      read_index_(0),
+      read_count_(reads_count),
+      writes_(writes),
+      write_index_(0),
+      write_count_(writes_count) {
+}
+
+StaticSocketDataProvider::~StaticSocketDataProvider() {}
+
 MockRead StaticSocketDataProvider::GetNextRead() {
   DCHECK(!at_read_eof());
   reads_[read_index_].time_stamp = base::Time::Now();
@@ -611,6 +634,8 @@ DynamicSocketDataProvider::DynamicSocketDataProvider()
       allow_unconsumed_reads_(false) {
 }
 
+DynamicSocketDataProvider::~DynamicSocketDataProvider() {}
+
 MockRead DynamicSocketDataProvider::GetNextRead() {
   if (reads_.empty())
     return MockRead(false, ERR_UNEXPECTED);
@@ -786,6 +811,8 @@ void OrderedSocketData::CompleteRead() {
   }
 }
 
+OrderedSocketData::~OrderedSocketData() {}
+
 DeterministicSocketData::DeterministicSocketData(MockRead* reads,
     size_t reads_count, MockWrite* writes, size_t writes_count)
     : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
@@ -936,6 +963,10 @@ void DeterministicSocketData::NextStep() {
 }
 
 
+MockClientSocketFactory::MockClientSocketFactory() {}
+
+MockClientSocketFactory::~MockClientSocketFactory() {}
+
 void MockClientSocketFactory::AddSocketDataProvider(
     SocketDataProvider* data) {
   mock_data_.Add(data);
@@ -987,6 +1018,10 @@ SSLClientSocket* MockClientSocketFactory::CreateSSLClientSocket(
   return socket;
 }
 
+DeterministicMockClientSocketFactory::DeterministicMockClientSocketFactory() {}
+
+DeterministicMockClientSocketFactory::~DeterministicMockClientSocketFactory() {}
+
 void DeterministicMockClientSocketFactory::AddSocketDataProvider(
     DeterministicSocketData* data) {
   mock_data_.Add(data);
@@ -1107,6 +1142,8 @@ MockTCPClientSocketPool::MockConnectJob::MockConnectJob(
           connect_callback_(this, &MockConnectJob::OnConnect)) {
 }
 
+MockTCPClientSocketPool::MockConnectJob::~MockConnectJob() {}
+
 int MockTCPClientSocketPool::MockConnectJob::Connect() {
   int rv = socket_->Connect(&connect_callback_);
   if (rv == OK) {
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 445f3c7..a8e4537 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -163,18 +163,10 @@ class SocketDataProvider {
 // writes.
 class StaticSocketDataProvider : public SocketDataProvider {
  public:
-  StaticSocketDataProvider() : reads_(NULL), read_index_(0), read_count_(0),
-      writes_(NULL), write_index_(0), write_count_(0) {}
+  StaticSocketDataProvider();
   StaticSocketDataProvider(MockRead* reads, size_t reads_count,
-                           MockWrite* writes, size_t writes_count)
-      : reads_(reads),
-        read_index_(0),
-        read_count_(reads_count),
-        writes_(writes),
-        write_index_(0),
-        write_count_(writes_count) {
-  }
-  virtual ~StaticSocketDataProvider() {}
+                           MockWrite* writes, size_t writes_count);
+  virtual ~StaticSocketDataProvider();
 
   // SocketDataProvider methods:
   virtual MockRead GetNextRead();
@@ -213,6 +205,7 @@ class StaticSocketDataProvider : public SocketDataProvider {
 class DynamicSocketDataProvider : public SocketDataProvider {
  public:
   DynamicSocketDataProvider();
+  virtual ~DynamicSocketDataProvider();
 
   // SocketDataProvider methods:
   virtual MockRead GetNextRead();
@@ -344,6 +337,9 @@ class OrderedSocketData : public StaticSocketDataProvider,
   void CompleteRead();
 
  private:
+  friend class base::RefCounted<OrderedSocketData>;
+  virtual ~OrderedSocketData();
+
   int sequence_number_;
   int loop_stop_stage_;
   CompletionCallback* callback_;
@@ -514,6 +510,9 @@ class MockSSLClientSocket;
 // socket types.
 class MockClientSocketFactory : public ClientSocketFactory {
  public:
+  MockClientSocketFactory();
+  virtual ~MockClientSocketFactory();
+
   void AddSocketDataProvider(SocketDataProvider* socket);
   void AddSSLSocketDataProvider(SSLSocketDataProvider* socket);
   void ResetNextMockIndexes();
@@ -806,6 +805,7 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
    public:
     MockConnectJob(ClientSocket* socket, ClientSocketHandle* handle,
                    CompletionCallback* callback);
+    ~MockConnectJob();
 
     int Connect();
     bool CancelHandle(const ClientSocketHandle* handle);
@@ -856,6 +856,9 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
 
 class DeterministicMockClientSocketFactory : public ClientSocketFactory {
  public:
+  DeterministicMockClientSocketFactory();
+  virtual ~DeterministicMockClientSocketFactory();
+
   void AddSocketDataProvider(DeterministicSocketData* socket);
   void AddSSLSocketDataProvider(SSLSocketDataProvider* socket);
   void ResetNextMockIndexes();