Implement the target locator commands for ChromeDriver.

chrome/test/webdriver/session_manager.cc

 // Copyright (c) 2011 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/session_manager.h"
 
 #include "base/logging.h"
 #include "chrome/test/webdriver/utility_functions.h"
 #include "net/base/net_util.h"
 
@@ skipping 12 matching lines @@
     if (host_entry)
       hostname = host_entry->h_name;
   }
 #endif
   if (hostname.empty()) {
     hostname = "localhost";
   }
   return hostname + ":" + port_;
 }
 
-Session* SessionManager::Create() {
-  std::string id = GenerateRandomID();
-  {
-    base::AutoLock lock(map_lock_);
-    if (map_.find(id) != map_.end()) {
-      LOG(ERROR) << "Failed to generate a unique session ID";
-      return NULL;
-    }
-  }
-
-  Session* session = new Session(id);
+void SessionManager::Add(Session* session) {
   base::AutoLock lock(map_lock_);
-  map_[id] = session;
-  return session;
+  map_[session->id()] = session;
 }
 
 bool SessionManager::Has(const std::string& id) const {
   base::AutoLock lock(map_lock_);
   return map_.find(id) != map_.end();
 }
 
-bool SessionManager::Delete(const std::string& id) {
+bool SessionManager::Remove(const std::string& id) {
   std::map<std::string, Session*>::iterator it;
-
   Session* session;
-  {
-    base::AutoLock lock(map_lock_);
-    it = map_.find(id);
-    if (it == map_.end()) {
-      VLOG(1) << "No such session with ID " << id;
-      return false;
-    }
-    session = it->second;
-    map_.erase(it);
+  base::AutoLock lock(map_lock_);
+  it = map_.find(id);
+  if (it == map_.end()) {
+    VLOG(1) << "No such session with ID " << id;
+    return false;
   }
-
-  VLOG(1) << "Deleting session with ID " << id;
-  delete session;
+  session = it->second;
+  map_.erase(it);
   return true;
 }
 
 Session* SessionManager::GetSession(const std::string& id) const {
   std::map<std::string, Session*>::const_iterator it;
   base::AutoLock lock(map_lock_);
   it = map_.find(id);
   if (it == map_.end()) {
     VLOG(1) << "No such session with ID " << id;
     return NULL;
   }
   return it->second;
 }
 
 SessionManager::SessionManager() : port_("") {}
 
 SessionManager::~SessionManager() {}
 
 // static
 SessionManager* SessionManager::GetInstance() {
   return Singleton<SessionManager>::get();
 }
 
 }  // namespace webdriver