Delete UDPClientSocket on same thread as creation. Also refactor.

chrome/browser/extensions/api/socket/socket_api_controller_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/socket/socket_api.h"
 #include "chrome/browser/extensions/api/socket/socket_api_controller.h"
 
 namespace extensions {
 
 class SocketApiControllerTest : public testing::Test {
 };
 
 TEST_F(SocketApiControllerTest, TestSocketControllerLifetime) {
   // We want to make sure that killing the controller while a bunch of
   // sockets are alive doesn't crash.
-  SocketController* controller = SocketController::GetInstance();
+  scoped_ptr<SocketController> controller(new SocketController());
 
   // Create some sockets but don't do anything with them.
   Profile* profile = NULL;
   const std::string extension_id("xxxxxxxxx");
   const GURL url;
   for (int i = 0; i < 10; ++i) {
     int socket_id = controller->CreateUdp(profile, extension_id, url);
     ASSERT_TRUE(socket_id != 0);
   }
 
   // Create some more sockets and connect them. Note that because this is
   // UDP, we can happily "connect" a UDP socket without anyone listening.
   const int kPort = 38888;
   const std::string address("127.0.0.1");
   for (int i = 0; i < 10; ++i) {
     int socket_id = controller->CreateUdp(profile, extension_id, url);
     ASSERT_TRUE(socket_id != 0);
     ASSERT_TRUE(controller->ConnectUdp(socket_id, address, kPort));
   }
-
-  // At this point, we're done, and we're relying on the RAE mechanism
-  // of the Singleton class to delete the controller at process exit.
-  // We'd have to jump through some icky hoops to turn off RAE and
-  // manually delete in this test method, so we'll instead take it on
-  // faith that the singleton will indeed delete itself, and that if
-  // we had any heap management problems in the controller, they'd
-  // show up later in this test process. I (miket) hereby confirm that
-  // I manually added a temporary double-free in the controller
-  // destructor and verified that the unit_tests process segfaulted.
 }
 
 }  // namespace extensions