DeterministicSocketDataProvider should not be RefCounted

BUG=123295
TEST=net_unittests


Review URL: https://chromiumcodereview.appspot.com/10690104

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

4 files changed, 13 insertions, 13 deletions

diff --git a/net/socket/buffered_write_stream_socket_unittest.cc b/net/socket/buffered_write_stream_socket_unittest.cc
index 9798a60..664422e 100644
--- a/net/socket/buffered_write_stream_socket_unittest.cc
+++ b/net/socket/buffered_write_stream_socket_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/socket/socket_test_util.h"
@@ -24,7 +25,7 @@ class BufferedWriteStreamSocketTest : public testing::Test {
   }
 
   void Initialize(MockWrite* writes, size_t writes_count) {
-    data_ = new DeterministicSocketData(NULL, 0, writes, writes_count);
+    data_.reset(new DeterministicSocketData(NULL, 0, writes, writes_count));
     data_->set_connect_data(MockConnect(SYNCHRONOUS, 0));
     if (writes_count) {
       data_->StopAfter(writes_count);
@@ -43,7 +44,7 @@ class BufferedWriteStreamSocketTest : public testing::Test {
   }
 
   scoped_ptr<BufferedWriteStreamSocket> socket_;
-  scoped_refptr<DeterministicSocketData> data_;
+  scoped_ptr<DeterministicSocketData> data_;
   BoundNetLog net_log_;
   TestCompletionCallback callback_;
 };
diff --git a/net/socket/deterministic_socket_data_unittest.cc b/net/socket/deterministic_socket_data_unittest.cc
index 99703be..e3fa4af 100644
--- a/net/socket/deterministic_socket_data_unittest.cc
+++ b/net/socket/deterministic_socket_data_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "net/socket/socket_test_util.h"
 
+#include <string.h>
+
+#include "base/memory/ref_counted.h"
 #include "testing/platform_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -44,7 +47,7 @@ class DeterministicSocketDataTest : public PlatformTest {
   TestCompletionCallback read_callback_;
   TestCompletionCallback write_callback_;
   StreamSocket* sock_;
-  scoped_refptr<DeterministicSocketData> data_;
+  scoped_ptr<DeterministicSocketData> data_;
 
  private:
   scoped_refptr<IOBuffer> read_buf_;
@@ -85,7 +88,8 @@ void DeterministicSocketDataTest::Initialize(MockRead* reads,
                                            size_t reads_count,
                                            MockWrite* writes,
                                            size_t writes_count) {
-  data_ = new DeterministicSocketData(reads, reads_count, writes, writes_count);
+  data_.reset(new DeterministicSocketData(reads, reads_count,
+                                          writes, writes_count));
   data_->set_connect_data(connect_data_);
   socket_factory_.AddSocketDataProvider(data_.get());
 
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 92783fd..d51d5c6 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -452,6 +452,8 @@ DeterministicSocketData::DeterministicSocketData(MockRead* reads,
       print_debug_(false) {
 }
 
+DeterministicSocketData::~DeterministicSocketData() {}
+
 void DeterministicSocketData::Run() {
   SetStopped(false);
   int counter = 0;
@@ -578,8 +580,6 @@ void DeterministicSocketData::Reset() {
   NOTREACHED();
 }
 
-DeterministicSocketData::~DeterministicSocketData() {}
-
 void DeterministicSocketData::InvokeCallbacks() {
   if (socket_ && socket_->write_pending() &&
       (current_write().sequence_number == sequence_number())) {
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 26a5075..2638afe 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -440,13 +440,13 @@ class DeterministicMockTCPClientSocket;
 // For examples of how to use this class, see:
 //   deterministic_socket_data_unittests.cc
 class DeterministicSocketData
-    : public StaticSocketDataProvider,
-      public base::RefCounted<DeterministicSocketData> {
+    : public StaticSocketDataProvider {
  public:
   // |reads| the list of MockRead completions.
   // |writes| the list of MockWrite completions.
   DeterministicSocketData(MockRead* reads, size_t reads_count,
                           MockWrite* writes, size_t writes_count);
+  virtual ~DeterministicSocketData();
 
   // Consume all the data up to the give stop point (via SetStop()).
   void Run();
@@ -481,12 +481,7 @@ class DeterministicSocketData
   virtual void Reset() OVERRIDE;
   virtual void CompleteRead() OVERRIDE {}
 
- protected:
-  virtual ~DeterministicSocketData();
-
  private:
-  friend class base::RefCounted<DeterministicSocketData>;
-
   // Invoke the read and write callbacks, if the timing is appropriate.
   void InvokeCallbacks();