Add a new GetInstance() method for singleton classes under chrome/service and /net.

net/websockets/websocket_job.cc

 // Copyright (c) 2010 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/websockets/websocket_job.h"
 
 #include <algorithm>
 
+#include "base/singleton.h"
 #include "base/string_tokenizer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/cookie_policy.h"
 #include "net/base/cookie_store.h"
 #include "net/base/io_buffer.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_context.h"
 #include "net/websockets/websocket_frame_handler.h"
@@ skipping 118 matching lines @@
 
 void WebSocketJob::RestartWithAuth(
     const string16& username,
     const string16& password) {
   state_ = CONNECTING;
   socket_->RestartWithAuth(username, password);
 }
 
 void WebSocketJob::DetachDelegate() {
   state_ = CLOSED;
-  Singleton<WebSocketThrottle>::get()->RemoveFromQueue(this);
-  Singleton<WebSocketThrottle>::get()->WakeupSocketIfNecessary();
+  WebSocketThrottle::GetInstance()->RemoveFromQueue(this);
+  WebSocketThrottle::GetInstance()->WakeupSocketIfNecessary();
 
   scoped_refptr<WebSocketJob> protect(this);
 
   delegate_ = NULL;
   if (socket_)
     socket_->DetachDelegate();
   socket_ = NULL;
   if (callback_) {
     waiting_ = false;
     callback_ = NULL;
     Release();  // Balanced with OnStartOpenConnection().
   }
 }
 
 int WebSocketJob::OnStartOpenConnection(
     SocketStream* socket, CompletionCallback* callback) {
   DCHECK(!callback_);
   state_ = CONNECTING;
   addresses_.Copy(socket->address_list().head(), true);
-  Singleton<WebSocketThrottle>::get()->PutInQueue(this);
+  WebSocketThrottle::GetInstance()->PutInQueue(this);
   if (!waiting_)
     return OK;
   callback_ = callback;
   AddRef();  // Balanced when callback_ becomes NULL.
   return ERR_IO_PENDING;
 }
 
 void WebSocketJob::OnConnected(
     SocketStream* socket, int max_pending_send_allowed) {
   if (state_ == CLOSED)
@@ skipping 51 matching lines @@
                     receive_frame_handler_->GetCurrentBufferSize());
     receive_frame_handler_->ReleaseCurrentBuffer();
   }
   if (delegate_ && received_data.size() > 0)
       delegate_->OnReceivedData(
           socket, received_data.data(), received_data.size());
 }
 
 void WebSocketJob::OnClose(SocketStream* socket) {
   state_ = CLOSED;
-  Singleton<WebSocketThrottle>::get()->RemoveFromQueue(this);
-  Singleton<WebSocketThrottle>::get()->WakeupSocketIfNecessary();
+  WebSocketThrottle::GetInstance()->RemoveFromQueue(this);
+  WebSocketThrottle::GetInstance()->WakeupSocketIfNecessary();
 
   scoped_refptr<WebSocketJob> protect(this);
 
   SocketStream::Delegate* delegate = delegate_;
   delegate_ = NULL;
   socket_ = NULL;
   if (callback_) {
     waiting_ = false;
     callback_ = NULL;
     Release();  // Balanced with OnStartOpenConnection().
@@ skipping 146 matching lines @@
       receive_frame_handler_->ReleaseCurrentBuffer();
     }
 
     state_ = OPEN;
     if (delegate_)
       delegate_->OnReceivedData(
           socket_, received_data.data(), received_data.size());
 
     handshake_response_.reset();
 
-    Singleton<WebSocketThrottle>::get()->RemoveFromQueue(this);
-    Singleton<WebSocketThrottle>::get()->WakeupSocketIfNecessary();
+    WebSocketThrottle::GetInstance()->RemoveFromQueue(this);
+    WebSocketThrottle::GetInstance()->WakeupSocketIfNecessary();
     return;
   }
 
   AddRef();  // Balanced in OnCanSetCookieCompleted
 
   int policy = OK;
   if (socket_->context()->cookie_policy()) {
     GURL url_for_cookies = GetURLForCookies();
     policy = socket_->context()->cookie_policy()->CanSetCookie(
         url_for_cookies,
@@ skipping 79 matching lines @@
       socket_->Close();
     return;
   }
   current_buffer_ = new DrainableIOBuffer(
       send_frame_handler_->GetCurrentBuffer(),
       send_frame_handler_->GetCurrentBufferSize());
   socket_->SendData(current_buffer_->data(), current_buffer_->BytesRemaining());
 }
 
 }  // namespace net