Move Singleton and related structs to namespace base

net/socket/websocket_endpoint_lock_manager.cc

 // Copyright 2014 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 "net/socket/websocket_endpoint_lock_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 15 matching lines @@
 }  // namespace
 
 WebSocketEndpointLockManager::Waiter::~Waiter() {
   if (next()) {
     DCHECK(previous());
     RemoveFromList();
   }
 }
 
 WebSocketEndpointLockManager* WebSocketEndpointLockManager::GetInstance() {
-  return Singleton<WebSocketEndpointLockManager>::get();
+  return base::Singleton<WebSocketEndpointLockManager>::get();
 }
 
 int WebSocketEndpointLockManager::LockEndpoint(const IPEndPoint& endpoint,
                                                Waiter* waiter) {
   LockInfoMap::value_type insert_value(endpoint, LockInfo());
   std::pair<LockInfoMap::iterator, bool> rv =
       lock_info_map_.insert(insert_value);
   LockInfo& lock_info_in_map = rv.first->second;
   if (rv.second) {
     DVLOG(3) << "Locking endpoint " << endpoint.ToString();
@@ skipping 116 matching lines @@
     LockInfoMap::iterator lock_info_it) {
   DVLOG(3) << "Removing (StreamSocket*)" << lock_info_it->second.socket
            << " for " << lock_info_it->first.ToString() << " ("
            << socket_lock_info_map_.size() << " socket(s) left)";
   size_t erased = socket_lock_info_map_.erase(lock_info_it->second.socket);
   DCHECK_EQ(1U, erased);
   lock_info_it->second.socket = NULL;
 }
 
 }  // namespace net