Delete UDPClientSocket on same thread as creation. Also refactor.

chrome/browser/extensions/api/socket/socket_api_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SOCKET_SOCKET_API_CONTROLLER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SOCKET_SOCKET_API_CONTROLLER_H_
 #pragma once
 
 #include <string>
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 
 class Profile;
 
 namespace base {
 class ListValue;
 class Value;
 }
 
 namespace net {
 class UDPClientSocket;
 class IPEndPoint;
 }
 
 namespace extensions {
 
 class Socket;
 
-// The SocketController singleton keeps track of all our Sockets, and provides
-// a convenient set of methods to manipulate them.
+// SocketController keeps track of a collection of Sockets and provides a
+// convenient set of methods to manipulate them.
 class SocketController {
  public:
-  static SocketController* GetInstance();
-
   SocketController();
   virtual ~SocketController();
 
   // Create/Destroy are a pair. They represent the allocation and deallocation
   // of the Socket object in memory.
   //
   // TODO(miket): we currently require the app developer to remember to call
   // Destroy, which is a buzzkill in JavaScript. I believe that to solve this,
   // we'll have to associate each Socket with a creator extension, and then
   // clean up when the extension goes out of scope. As the API is defined
@@ skipping 18 matching lines @@
                                net::IPEndPoint* ip_end_point);
 
  private:
   int next_socket_id_;
   typedef std::map<int, Socket*> SocketMap;
   SocketMap socket_map_;
 
   // Convenience method for accessing SocketMap.
   Socket* GetSocket(int socket_id);
 
-  friend struct DefaultSingletonTraits<SocketController>;
-
   DISALLOW_COPY_AND_ASSIGN(SocketController);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SOCKET_SOCKET_API_CONTROLLER_H_