Implement the webdriver window sizing commands.

chrome/test/webdriver/webdriver_util.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/webdriver_util.h"
 
 #include "base/basictypes.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/string_split.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/test/automation/automation_json_requests.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using base::Value;
 
 namespace webdriver {
 
@@ skipping 89 matching lines @@
     case Value::TYPE_BINARY:
       return "binary";
     case Value::TYPE_DICTIONARY:
       return "dictionary";
     case Value::TYPE_LIST:
       return "list";
   }
   return "unknown";
 }
 
+std::string AutomationIdToString(const AutomationId& id) {
+  return base::StringPrintf("%d-%s", id.type(), id.id().c_str());
+}
+
 bool StringToAutomationId(const std::string& string_id, AutomationId* id) {
-  scoped_ptr<Value> value(base::JSONReader::Read(string_id, false));
-  std::string error_msg;
-  return value.get() && AutomationId::FromValue(value.get(), id, &error_msg);
+  std::vector<std::string> split_id;
+  base::SplitString(string_id, '-', &split_id);
+  if (split_id.size() != 2)
+    return false;
+  int type;
+  if (!base::StringToInt(split_id[0], &type))
+    return false;
+  *id = AutomationId(static_cast<AutomationId::Type>(type), split_id[1]);
+  return true;
 }
 
 std::string WebViewIdToString(const WebViewId& view_id) {
-  DictionaryValue* dict = view_id.GetId().ToValue();
-  if (view_id.old_style())
-    dict->SetBoolean("old_style", true);
-  return JsonStringify(dict);
+  return base::StringPrintf(
+      "%s%s",
+      view_id.old_style() ? "t" : "f",
+      AutomationIdToString(view_id.GetId()).c_str());
 }
 
 bool StringToWebViewId(const std::string& string_id, WebViewId* view_id) {
-  scoped_ptr<Value> value(base::JSONReader::Read(string_id, false));
+  if (string_id.empty() || (string_id[0] != 'f' && string_id[0] != 't'))
+    return false;
+  bool old_style = string_id[0] == 't';
   AutomationId id;
-  std::string error_msg;
-  DictionaryValue* dict;
-  if (!value.get() || !AutomationId::FromValue(value.get(), &id, &error_msg) ||
-      !value->GetAsDictionary(&dict))
+  if (!StringToAutomationId(string_id.substr(1), &id))
     return false;
 
-  bool old_style = false;
-  dict->GetBoolean("old_style", &old_style);
-
   if (old_style) {
     int tab_id;
     if (!base::StringToInt(id.id(), &tab_id))
       return false;
     *view_id = WebViewId::ForOldStyleTab(tab_id);
   } else {
     *view_id = WebViewId::ForView(id);
   }
   return true;
 }
@@ skipping 23 matching lines @@
 
 bool ValueConversionTraits<webdriver::SkipParsing>::SetFromValue(
     const Value* value, const webdriver::SkipParsing* t) {
   return true;
 }
 
 bool ValueConversionTraits<webdriver::SkipParsing>::CanConvert(
     const Value* value) {
   return true;
 }