| Index: chrome/test/webdriver/commands/webdriver_command.cc
|
| diff --git a/chrome/test/webdriver/commands/webdriver_command.cc b/chrome/test/webdriver/commands/webdriver_command.cc
|
| deleted file mode 100644
|
| index b431c583e1da68539c3d032bc4166ec4c2596767..0000000000000000000000000000000000000000
|
| --- a/chrome/test/webdriver/commands/webdriver_command.cc
|
| +++ /dev/null
|
| @@ -1,91 +0,0 @@
|
| -// 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/commands/webdriver_command.h"
|
| -
|
| -#include <string>
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/memory/singleton.h"
|
| -#include "base/strings/string_util.h"
|
| -#include "base/strings/stringprintf.h"
|
| -#include "base/values.h"
|
| -#include "chrome/test/webdriver/commands/response.h"
|
| -#include "chrome/test/webdriver/webdriver_error.h"
|
| -#include "chrome/test/webdriver/webdriver_logging.h"
|
| -#include "chrome/test/webdriver/webdriver_session.h"
|
| -#include "chrome/test/webdriver/webdriver_session_manager.h"
|
| -#include "chrome/test/webdriver/webdriver_util.h"
|
| -
|
| -namespace webdriver {
|
| -
|
| -WebDriverCommand::WebDriverCommand(
|
| - const std::vector<std::string>& path_segments,
|
| - const base::DictionaryValue* const parameters)
|
| - : Command(path_segments, parameters), session_(NULL) {
|
| -}
|
| -
|
| -WebDriverCommand::~WebDriverCommand() {}
|
| -
|
| -bool WebDriverCommand::Init(Response* const response) {
|
| - // There should be at least 3 path segments to match "/session/$id".
|
| - session_id_ = GetPathVariable(2);
|
| - if (session_id_.length() == 0) {
|
| - response->SetError(
|
| - new Error(kBadRequest, "No session ID specified"));
|
| - return false;
|
| - }
|
| -
|
| - session_ = SessionManager::GetInstance()->GetSession(session_id_);
|
| - if (session_ == NULL) {
|
| - response->SetError(
|
| - new Error(kSessionNotFound, "Session not found: " + session_id_));
|
| - return false;
|
| - }
|
| -
|
| - std::string message = base::StringPrintf(
|
| - "Command received (%s)", JoinString(path_segments_, '/').c_str());
|
| - if (parameters_.get())
|
| - message += " with params " + JsonStringifyForDisplay(parameters_.get());
|
| - session_->logger().Log(kFineLogLevel, message);
|
| -
|
| - if (ShouldRunPreAndPostCommandHandlers()) {
|
| - Error* error = session_->BeforeExecuteCommand();
|
| - if (error) {
|
| - response->SetError(error);
|
| - return false;
|
| - }
|
| - }
|
| - response->SetField("sessionId", new base::StringValue(session_id_));
|
| - return true;
|
| -}
|
| -
|
| -void WebDriverCommand::Finish(Response* const response) {
|
| - // The session may have been terminated as a result of the command.
|
| - if (!SessionManager::GetInstance()->Has(session_id_))
|
| - return;
|
| -
|
| - if (ShouldRunPreAndPostCommandHandlers()) {
|
| - scoped_ptr<Error> error(session_->AfterExecuteCommand());
|
| - if (error.get()) {
|
| - session_->logger().Log(kWarningLogLevel,
|
| - "AfterExecuteCommand failed: " + error->details());
|
| - }
|
| - }
|
| -
|
| - LogLevel level = kWarningLogLevel;
|
| - if (response->GetStatus() == kSuccess)
|
| - level = kFineLogLevel;
|
| - session_->logger().Log(
|
| - level, base::StringPrintf(
|
| - "Command finished (%s) with response %s",
|
| - JoinString(path_segments_, '/').c_str(),
|
| - JsonStringifyForDisplay(response->GetDictionary()).c_str()));
|
| -}
|
| -
|
| -bool WebDriverCommand::ShouldRunPreAndPostCommandHandlers() {
|
| - return true;
|
| -}
|
| -
|
| -} // namespace webdriver
|
|
|