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

chrome/test/webdriver/commands/webdriver_command.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 "chrome/test/webdriver/commands/webdriver_command.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/singleton.h"
@@ skipping 33 matching lines @@
 bool WebDriverCommand::Init(Response* const response) {
   // There should be at least 3 path segments to match "/session/$id".
   std::string session_id = GetPathVariable(2);
   if (session_id.length() == 0) {
     response->set_value(Value::CreateStringValue("No session ID specified"));
     response->set_status(kBadRequest);
     return false;
   }
 
   VLOG(1) << "Fetching session: " << session_id;
-  session_ = Singleton<SessionManager>::get()->GetSession(session_id);
+  session_ = SessionManager::GetInstance()->GetSession(session_id);
   if (session_ == NULL) {
     response->set_value(Value::CreateStringValue(
         "Session not found: " + session_id));
     response->set_status(kSessionNotFound);
     return false;
   }
 
   response->SetField("sessionId", Value::CreateStringValue(session_id));
   return !RequiresValidTab() || VerifyTabIsValid(response);
 }
 
 bool WebDriverCommand::VerifyTabIsValid(Response* response) {
   tab_ = session_->ActiveTab();
   if (!tab_.get()) {
     response->set_value(Value::CreateStringValue(
         "Lost session window handle; did you close the window?"));
     response->set_status(kNoSuchWindow);
     return false;
   }
   return true;
 }
 
 }  // namespace webdriver