Add chrome.loadAsync capability to ChromeDriver, which allows the user not to

chrome/test/webdriver/commands/create_session.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/create_session.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/zip.h"
 #include "chrome/test/webdriver/commands/response.h"
 #include "chrome/test/webdriver/session.h"
 #include "chrome/test/webdriver/session_manager.h"
 #include "chrome/test/webdriver/webdriver_error.h"
 
+namespace webdriver {
+
 namespace {
 
 bool WriteBase64DataToFile(const FilePath& filename,
                            const std::string& base64data,
                            std::string* error_msg) {
   std::string data;
   if (!base::Base64Decode(base64data, &data)) {
     *error_msg = "Invalid base64 encoded data.";
     return false;
   }
   if (!file_util::WriteFile(filename, data.c_str(), data.length())) {
     *error_msg = "Could not write data to file.";
     return false;
   }
   return true;
 }
 
+Error* GetBooleanCapability(
+    const base::DictionaryValue* dict, const std::string& key, bool* option) {
+  Value* value = NULL;
+  if (dict->GetWithoutPathExpansion(key, &value)) {
+    if (!value->GetAsBoolean(option)) {
+      return new Error(kUnknownError, key + " must be a boolean");
+    }
+  }
+  return NULL;
+}
+
 }  // namespace
 
-namespace webdriver {
-
 CreateSession::CreateSession(const std::vector<std::string>& path_segments,
                              const DictionaryValue* const parameters)
     : Command(path_segments, parameters) {}
 
 CreateSession::~CreateSession() {}
 
 bool CreateSession::DoesPost() { return true; }
 
 void CreateSession::ExecutePost(Response* const response) {
   DictionaryValue *capabilities = NULL;
@@ skipping 109 matching lines @@
         return;
       }
       extensions.push_back(extension_file);
     }
   } else if (capabilities->HasKey(kExtensions)) {
     response->SetError(new Error(
         kBadRequest, "Extensions must be a list of base64 encoded strings"));
     return;
   }
 
+  Session::Options options;
+  Error* error = NULL;
+  error = GetBooleanCapability(capabilities, "chrome.nativeEvents",
+                               &options.use_native_events);
+  if (!error) {
+    error = GetBooleanCapability(capabilities, "chrome.loadAsync",
+                                 &options.load_async);
+  }
+  if (error) {
+    response->SetError(error);
+    return;
+  }
+
   // Session manages its own liftime, so do not call delete.
-  Session* session = new Session();
-  Error* error = session->Init(browser_exe,
-                               temp_user_data_dir,
-                               command_line_options);
+  Session* session = new Session(options);
+  error = session->Init(browser_exe,
+                        temp_user_data_dir,
+                        command_line_options);
   if (error) {
     response->SetError(error);
     return;
   }
 
   // Install extensions.
   for (size_t i = 0; i < extensions.size(); ++i) {
     Error* error = session->InstallExtension(extensions[i]);
     if (error) {
       response->SetError(error);
       return;
     }
   }
 
-  bool native_events_required = false;
-  Value* native_events_value = NULL;
-  if (capabilities->GetWithoutPathExpansion(
-          "chrome.nativeEvents", &native_events_value)) {
-    if (native_events_value->GetAsBoolean(&native_events_required)) {
-      session->set_use_native_events(native_events_required);
-    }
-  }
-  bool screenshot_on_error = false;
-  if (capabilities->GetBoolean(
-          "takeScreenshotOnError", &screenshot_on_error)) {
-    session->set_screenshot_on_error(screenshot_on_error);
-  }
-
   LOG(INFO) << "Created session " << session->id();
   // Redirect to a relative URI. Although prohibited by the HTTP standard,
   // this is what the IEDriver does. Finding the actual IP address is
   // difficult, and returning the hostname causes perf problems with the python
   // bindings on Windows.
   std::ostringstream stream;
   stream << SessionManager::GetInstance()->url_base() << "/session/"
          << session->id();
   response->SetStatus(kSeeOther);
   response->SetValue(Value::CreateStringValue(stream.str()));
 }
 
 }  // namespace webdriver