| Index: chrome/test/webdriver/session_manager.cc
|
| diff --git a/chrome/test/webdriver/session_manager.cc b/chrome/test/webdriver/session_manager.cc
|
| index f37611bb3cef74d00b005a7b3582e02ce110ddf3..be7c915070694d0d45dfaf17c83cbb00f31d0632 100644
|
| --- a/chrome/test/webdriver/session_manager.cc
|
| +++ b/chrome/test/webdriver/session_manager.cc
|
| @@ -32,7 +32,7 @@ std::string SessionManager::GetAddress() {
|
|
|
| void SessionManager::Add(Session* session) {
|
| base::AutoLock lock(map_lock_);
|
| - map_[session->id()] = session;
|
| + map_[session->Id()] = session;
|
| }
|
|
|
| bool SessionManager::Has(const std::string& id) const {
|
| @@ -65,27 +65,36 @@ Session* SessionManager::GetSession(const std::string& id) const {
|
| return it->second;
|
| }
|
|
|
| -void SessionManager::set_port(const std::string& port) {
|
| +void SessionManager::SetPort(const std::string& port) {
|
| port_ = port;
|
| }
|
|
|
| -void SessionManager::set_url_base(const std::string& url_base) {
|
| - url_base_ = url_base;
|
| +void SessionManager::SetChromeDir(const FilePath& chrome_dir) {
|
| + chrome_dir_ = chrome_dir;
|
| }
|
|
|
| -std::string SessionManager::url_base() const {
|
| - return url_base_;
|
| +FilePath SessionManager::ChromeDir() const {
|
| + return chrome_dir_;
|
| }
|
|
|
| -void SessionManager::set_chrome_dir(const FilePath& chrome_dir) {
|
| - chrome_dir_ = chrome_dir;
|
| +void SessionManager::SetScreenshotOnError(bool screenshot) {
|
| + screenshot_on_error_ = screenshot;
|
| }
|
|
|
| -FilePath SessionManager::chrome_dir() const {
|
| - return chrome_dir_;
|
| +bool SessionManager::ScreenshotOnError() const {
|
| + return screenshot_on_error_;
|
| +}
|
| +
|
| +void SessionManager::SetUrlBase(const std::string& url_base) {
|
| + url_base_ = url_base;
|
| +}
|
| +
|
| +std::string SessionManager::UrlBase() const {
|
| + return url_base_;
|
| }
|
|
|
| -SessionManager::SessionManager() : port_(""), url_base_("") {}
|
| +SessionManager::SessionManager()
|
| + : port_(""), url_base_(""), screenshot_on_error_(false) {}
|
|
|
| SessionManager::~SessionManager() {}
|
|
|
|
|