Add a new GetInstance() method for singleton classes, take 2.

chrome/test/webdriver/server.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 <signal.h>
 #include <stdlib.h>
 #ifndef _WIN32
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ skipping 88 matching lines @@
   signal(SIGPIPE, SIG_IGN);
   signal(SIGCHLD, &signal_handler);
 #endif
   srand((unsigned int)time(NULL));
 
   if (cmd_line.HasSwitch(std::string("port"))) {
     port = cmd_line.GetSwitchValueASCII(std::string("port"));
   }
 
   VLOG(1) << "Using port: " << port;
-  webdriver::SessionManager* session =
-      Singleton<webdriver::SessionManager>::get();
+  webdriver::SessionManager* session = webdriver::SessionManager::GetInstance();
   session->SetIPAddress(port);
 
   // Initialize SHTTPD context.
   // Listen on port 8080 or port specified on command line.
   // TODO(jmikhail) Maybe add port 8081 as a secure connection.
   ctx = mg_start();
   mg_set_option(ctx, "ports", port.c_str());
 
   webdriver::InitCallbacks(ctx);
 
   std::cout << "Starting server" << std::endl;
   // The default behavior is to run this service forever.
   while (true)
     PlatformThread::Sleep(3600);
 
   // We should not reach here since the service should never quit.
   // TODO(jmikhail): register a listener for SIGTERM and break the
   // message loop gracefully.
   mg_stop(ctx);
   return (EXIT_SUCCESS);
 }