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

net/websockets/websocket_job_unittest.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 <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 204 matching lines @@
     struct addrinfo addr;
     memset(&addr, 0, sizeof(struct addrinfo));
     addr.ai_family = AF_INET;
     addr.ai_addrlen = sizeof(struct sockaddr_in);
     struct sockaddr_in sa_in;
     memset(&sa_in, 0, sizeof(struct sockaddr_in));
     memcpy(&sa_in.sin_addr, "\x7f\0\0\1", 4);
     addr.ai_addr = reinterpret_cast<sockaddr*>(&sa_in);
     addr.ai_next = NULL;
     websocket_->addresses_.Copy(&addr, true);
-    Singleton<WebSocketThrottle>::get()->PutInQueue(websocket_);
+    WebSocketThrottle::GetInstance()->PutInQueue(websocket_);
   }
   WebSocketJob::State GetWebSocketJobState() {
     return websocket_->state_;
   }
   void CloseWebSocketJob() {
     if (websocket_->socket_) {
       websocket_->socket_->DetachDelegate();
-      Singleton<WebSocketThrottle>::get()->RemoveFromQueue(websocket_);
+      WebSocketThrottle::GetInstance()->RemoveFromQueue(websocket_);
     }
     websocket_->state_ = WebSocketJob::CLOSED;
     websocket_->delegate_ = NULL;
     websocket_->socket_ = NULL;
   }
 
   scoped_refptr<MockCookieStore> cookie_store_;
   scoped_refptr<MockCookiePolicy> cookie_policy_;
   scoped_refptr<MockURLRequestContext> context_;
   scoped_refptr<WebSocketJob> websocket_;
@@ skipping 271 matching lines @@
   EXPECT_EQ(2U, cookie_store_->entries().size());
   EXPECT_EQ(cookieUrl, cookie_store_->entries()[0].url);
   EXPECT_EQ("CR-test=1", cookie_store_->entries()[0].cookie_line);
   EXPECT_EQ(cookieUrl, cookie_store_->entries()[1].url);
   EXPECT_EQ("CR-test-httponly=1", cookie_store_->entries()[1].cookie_line);
 
   CloseWebSocketJob();
 }
 
 }  // namespace net