1 files changed, 22 insertions, 66 deletions

diff --git a/chrome/test/webdriver/commands/response.h b/chrome/test/webdriver/commands/response.h
index 3b39302..b77404d 100644
--- a/chrome/test/webdriver/commands/response.h
+++ b/chrome/test/webdriver/commands/response.h
@@ -8,9 +8,6 @@
 #include <sstream>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/json/json_writer.h"
-#include "base/logging.h"
 #include "base/values.h"
 #include "chrome/test/webdriver/error_codes.h"
 
@@ -18,11 +15,9 @@ namespace webdriver {
 
 // All errors in webdriver must use this macro in order to send back
 // a proper stack trace to the client
-#define SET_WEBDRIVER_ERROR(response, msg, err) { \
-  LOG(ERROR) << msg; \
-  response->set_error(msg, __FILE__, __LINE__); \
-  response->set_status(err); \
-}
+#define SET_WEBDRIVER_ERROR(response, msg, err) \
+  response->SetError(err, msg, __FILE__, __LINE__); \
+  LOG(ERROR) << msg
 
 // A simple class that encapsulates the information describing the response to
 // a |Command|. In Webdriver all responses must be sent back as a JSON value,
@@ -30,76 +25,37 @@ namespace webdriver {
 // http://code.google.com/p/selenium/wiki/JsonWireProtocol#Messages
 class Response {
  public:
-  inline Response() : status_(kSuccess) {
-    set_value(Value::CreateNullValue());
-  }
-
-  inline ErrorCode status() const { return status_; }
-  inline void set_status(const ErrorCode status) {
-    status_ = status;
-    data_.SetInteger(kStatusKey, status_);
-  }
-
-  // Ownership of the returned pointer is kept by the class and held in
-  // the Dictiionary Value data_.
-  inline const Value* value() const {
-    Value* out = NULL;
-    LOG_IF(WARNING, !data_.Get(kValueKey, &out))
-        << "Accessing unset response value.";  // Should never happen.
-    return out;
-  }
+  // Creates a new |Response| with a default status of |kSuccess| and a
+  // |NullValue|.
+  Response();
+  ~Response();
 
-  // Sets the |value| of this response, assuming ownership of the object in the
-  // process.
-  inline void set_value(Value* value) {
-    data_.Set(kValueKey, value);
-  }
+  ErrorCode GetStatus() const;
+  void SetStatus(ErrorCode status);
 
-  // Sets the |value| of this response, assuming ownership of the object in the
-  // process.  This function is mostly used to report error values.
-  inline void set_error(const char msg[], const char file[], const int line) {
-    DictionaryValue* error = new DictionaryValue();
-    DictionaryValue* stack = new DictionaryValue();
+  // Ownership of the returned pointer is kept by this object.
+  const Value* GetValue() const;
 
-    error->SetString(std::string(kMessageKey), msg);
-    stack->SetString(std::string(kFileName), std::string(file));
-    stack->SetInteger(std::string(kLineNumber), line);
+  // Sets the |value| of this response, assuming ownership of the object in the
+  // process.
+  void SetValue(Value* value);
 
-    error->Set(std::string(kStackTrace), stack);
-    data_.Set(kValueKey, error);
-  }
+  // Configures this response to report an error. The |file| and |line|
+  // parameters, which identify where in the source the error occurred, can be
+  // set using the |SET_WEBDRIVER_ERROR| macro above.
+  void SetError(ErrorCode error, const std::string& message,
+                const std::string& file, int line);
 
   // Sets a JSON field in this response. The |key| may be a "." delimitted
   // string to indicate the value should be set in a nested object. Any
   // previously set value for the |key| will be deleted.
-  // This object assumes ownership of |in_value|.
-  inline void SetField(const std::string& key, Value* value) {
-    data_.Set(key, value);
-  }
+  // This object assumes ownership of |value|.
+  void SetField(const std::string& key, Value* value);
 
   // Returns this response as a JSON string.
-  std::string ToJSON() const {
-    std::string json;
-    base::JSONWriter::Write(static_cast<const Value*>(&data_), false, &json);
-    return json;
-  }
+  std::string ToJSON() const;
 
  private:
-  // The hard coded values for the keys below are set in the command.cc file.
-  static const char* const kStatusKey;
-  static const char* const kValueKey;
-
-  // Optional values used for errors.
-  static const char* const kMessageKey;
-  static const char* const kScreenKey;
-  static const char* const kClassKey;
-  static const char* const kStackTrace;
-  static const char* const kFileName;
-  static const char* const kLineNumber;
-
-  // The response status code. Stored outside of |data_| since it is
-  // likely to be queried often.
-  ErrorCode status_;
   DictionaryValue data_;
 
   DISALLOW_COPY_AND_ASSIGN(Response);