Add commands to Chrome WebDriver for installing and manipulating extensions.

chrome/test/webdriver/commands/target_locator_commands.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/commands/target_locator_commands.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/test/webdriver/commands/response.h"
 #include "chrome/test/webdriver/webdriver_element_id.h"
 #include "chrome/test/webdriver/webdriver_error.h"
 #include "chrome/test/webdriver/webdriver_session.h"
+#include "chrome/test/webdriver/webdriver_util.h"
+
+using base::Value;
 
 namespace webdriver {
 
 WindowHandleCommand::WindowHandleCommand(
     const std::vector<std::string>& path_segments,
     DictionaryValue* parameters)
     : WebDriverCommand(path_segments, parameters) {}
 
 WindowHandleCommand::~WindowHandleCommand() {}
 
 bool WindowHandleCommand::DoesGet() {
   return true;
 }
 
 void WindowHandleCommand::ExecuteGet(Response* const response) {
-  response->SetValue(new StringValue(
-      base::IntToString(session_->current_target().window_id)));
+  response->SetValue(Value::CreateStringValue(
+      WebViewIdToString(session_->current_target().view_id)));
 }
 
 WindowHandlesCommand::WindowHandlesCommand(
     const std::vector<std::string>& path_segments,
     DictionaryValue* parameters)
     : WebDriverCommand(path_segments, parameters) {}
 
 WindowHandlesCommand::~WindowHandlesCommand() {}
 
 bool WindowHandlesCommand::DoesGet() {
   return true;
 }
 
 void WindowHandlesCommand::ExecuteGet(Response* const response) {
-  std::vector<int> window_ids;
-  Error* error = session_->GetWindowIds(&window_ids);
+  std::vector<WebViewInfo> views;
+  Error* error = session_->GetViews(&views);
   if (error) {
     response->SetError(error);
     return;
   }
-  ListValue* id_list = new ListValue();
-  for (size_t i = 0; i < window_ids.size(); ++i)
-    id_list->Append(new StringValue(base::IntToString(window_ids[i])));
+  base::ListValue* id_list = new base::ListValue();
+  for (size_t i = 0; i < views.size(); ++i) {
+    if (!views[i].view_id.IsTab())
+      continue;
+    id_list->Append(Value::CreateStringValue(
+        WebViewIdToString(views[i].view_id)));
+  }
   response->SetValue(id_list);
 }
 
 WindowCommand::WindowCommand(
     const std::vector<std::string>& path_segments,
     DictionaryValue* parameters)
     : WebDriverCommand(path_segments, parameters) {}
 
 WindowCommand::~WindowCommand() {}
 
 bool WindowCommand::DoesPost() {
   return true;
 }
 
 bool WindowCommand::DoesDelete() {
   return true;
 }
 
 void WindowCommand::ExecutePost(Response* const response) {
   std::string name;
   if (!GetStringParameter("name", &name)) {
     response->SetError(new Error(
         kBadRequest, "Missing or invalid 'name' parameter"));
     return;
   }
 
-  Error* error = session_->SwitchToWindow(name);
+  Error* error = session_->SwitchToView(name);
   if (error)
     response->SetError(error);
 }
 
 void WindowCommand::ExecuteDelete(Response* const response) {
   Error* error = session_->CloseWindow();
   if (error)
     response->SetError(error);
 }
 
@@ skipping 61 matching lines @@
   Error* error = session_->ExecuteScript(
       "return document.activeElement || document.body", &args, &result);
   if (error) {
     response->SetError(error);
     return;
   }
   response->SetValue(result);
 }
 
 }  // namespace webdriver