#include "base/base64.h"
#include "base/basictypes.h"
+#include "base/bind.h"
#include "base/command_line.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/format_macros.h"
#include "base/json/json_reader.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/test/chromedriver/chrome/chrome_android_impl.h"
#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h"
-#include "chrome/test/chromedriver/chrome/chrome_existing_impl.h"
#include "chrome/test/chromedriver/chrome/chrome_finder.h"
+#include "chrome/test/chromedriver/chrome/chrome_remote_impl.h"
#include "chrome/test/chromedriver/chrome/device_manager.h"
+#include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
+#include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
#include "chrome/test/chromedriver/chrome/devtools_http_client.h"
#include "chrome/test/chromedriver/chrome/embedded_automation_extension.h"
#include "chrome/test/chromedriver/chrome/status.h"
switches.SetSwitch("disable-component-update");
switches.SetSwitch("disable-default-apps");
switches.SetSwitch("enable-logging");
- switches.SetSwitch("logging-level", "1");
+ switches.SetSwitch("log-level", "0");
switches.SetSwitch("password-store", "basic");
switches.SetSwitch("use-mock-keychain");
switches.SetSwitch("remote-debugging-port", base::IntToString(port));
+ switches.SetSwitch("test-type", "webdriver");
for (std::set<std::string>::const_iterator iter =
capabilities.exclude_switches.begin();
const NetAddress& address,
URLRequestContextGetter* context_getter,
const SyncWebSocketFactory& socket_factory,
+ const Capabilities* capabilities,
scoped_ptr<DevToolsHttpClient>* user_client) {
+ scoped_ptr<DeviceMetrics> device_metrics;
+ if (capabilities && capabilities->device_metrics)
+ device_metrics.reset(new DeviceMetrics(*capabilities->device_metrics));
+
scoped_ptr<DevToolsHttpClient> client(new DevToolsHttpClient(
- address, context_getter, socket_factory));
+ address, context_getter, socket_factory, device_metrics.Pass()));
base::TimeTicks deadline =
base::TimeTicks::Now() + base::TimeDelta::FromSeconds(60);
Status status = client->Init(deadline - base::TimeTicks::Now());
return Status(kUnknownError, "unable to discover open pages");
}
-Status LaunchExistingChromeSession(
+Status CreateBrowserwideDevToolsClientAndConnect(
+ const NetAddress& address,
+ const PerfLoggingPrefs& perf_logging_prefs,
+ const SyncWebSocketFactory& socket_factory,
+ ScopedVector<DevToolsEventListener>& devtools_event_listeners,
+ scoped_ptr<DevToolsClient>* browser_client) {
+ scoped_ptr<DevToolsClient> client(new DevToolsClientImpl(
+ socket_factory, base::StringPrintf("ws://%s/devtools/browser/",
+ address.ToString().c_str()),
+ DevToolsClientImpl::kBrowserwideDevToolsClientId));
+ for (ScopedVector<DevToolsEventListener>::const_iterator it =
+ devtools_event_listeners.begin();
+ it != devtools_event_listeners.end();
+ ++it) {
+ // Only add listeners that subscribe to the browser-wide |DevToolsClient|.
+ // Otherwise, listeners will think this client is associated with a webview,
+ // and will send unrecognized commands to it.
+ if ((*it)->subscribes_to_browser())
+ client->AddListener(*it);
+ }
+ // Provide the client regardless of whether it connects, so that Chrome always
+ // has a valid |devtools_websocket_client_|. If not connected, no listeners
+ // will be notified, and client will just return kDisconnected errors if used.
+ *browser_client = client.Pass();
+ // To avoid unnecessary overhead, only connect if tracing is enabled, since
+ // the browser-wide client is currently only used for tracing.
+ if (!perf_logging_prefs.trace_categories.empty()) {
+ Status status = (*browser_client)->ConnectIfNecessary();
+ if (status.IsError())
+ return status;
+ }
+ return Status(kOk);
+}
+
+Status LaunchRemoteChromeSession(
URLRequestContextGetter* context_getter,
const SyncWebSocketFactory& socket_factory,
const Capabilities& capabilities,
ScopedVector<DevToolsEventListener>& devtools_event_listeners,
scoped_ptr<Chrome>* chrome) {
Status status(kOk);
- scoped_ptr<DevToolsHttpClient> devtools_client;
+ scoped_ptr<DevToolsHttpClient> devtools_http_client;
status = WaitForDevToolsAndCheckVersion(
capabilities.debugger_address, context_getter, socket_factory,
- &devtools_client);
+ NULL, &devtools_http_client);
if (status.IsError()) {
return Status(kUnknownError, "cannot connect to chrome at " +
capabilities.debugger_address.ToString(),
status);
}
- chrome->reset(new ChromeExistingImpl(devtools_client.Pass(),
- devtools_event_listeners));
+
+ scoped_ptr<DevToolsClient> devtools_websocket_client;
+ status = CreateBrowserwideDevToolsClientAndConnect(
+ capabilities.debugger_address, capabilities.perf_logging_prefs,
+ socket_factory, devtools_event_listeners, &devtools_websocket_client);
+ if (status.IsError()) {
+ LOG(WARNING) << "Browser-wide DevTools client failed to connect: "
+ << status.message();
+ }
+
+ chrome->reset(new ChromeRemoteImpl(devtools_http_client.Pass(),
+ devtools_websocket_client.Pass(),
+ devtools_event_listeners));
return Status(kOk);
}
if (!base::LaunchProcess(command, options, &process))
return Status(kUnknownError, "chrome failed to start");
- scoped_ptr<DevToolsHttpClient> devtools_client;
+ scoped_ptr<DevToolsHttpClient> devtools_http_client;
status = WaitForDevToolsAndCheckVersion(
- NetAddress(port), context_getter, socket_factory, &devtools_client);
+ NetAddress(port), context_getter, socket_factory, &capabilities,
+ &devtools_http_client);
if (status.IsError()) {
int exit_code;
}
return status;
}
+
+ scoped_ptr<DevToolsClient> devtools_websocket_client;
+ status = CreateBrowserwideDevToolsClientAndConnect(
+ NetAddress(port), capabilities.perf_logging_prefs, socket_factory,
+ devtools_event_listeners, &devtools_websocket_client);
+ if (status.IsError()) {
+ LOG(WARNING) << "Browser-wide DevTools client failed to connect: "
+ << status.message();
+ }
+
scoped_ptr<ChromeDesktopImpl> chrome_desktop(
- new ChromeDesktopImpl(devtools_client.Pass(),
+ new ChromeDesktopImpl(devtools_http_client.Pass(),
+ devtools_websocket_client.Pass(),
devtools_event_listeners,
port_reservation.Pass(),
process,
return status;
}
- scoped_ptr<DevToolsHttpClient> devtools_client;
+ scoped_ptr<DevToolsHttpClient> devtools_http_client;
status = WaitForDevToolsAndCheckVersion(NetAddress(port),
context_getter,
socket_factory,
- &devtools_client);
+ &capabilities,
+ &devtools_http_client);
if (status.IsError()) {
device->TearDown();
return status;
}
- chrome->reset(new ChromeAndroidImpl(devtools_client.Pass(),
+ scoped_ptr<DevToolsClient> devtools_websocket_client;
+ status = CreateBrowserwideDevToolsClientAndConnect(
+ NetAddress(port), capabilities.perf_logging_prefs, socket_factory,
+ devtools_event_listeners, &devtools_websocket_client);
+ if (status.IsError()) {
+ LOG(WARNING) << "Browser-wide DevTools client failed to connect: "
+ << status.message();
+ }
+
+ chrome->reset(new ChromeAndroidImpl(devtools_http_client.Pass(),
+ devtools_websocket_client.Pass(),
devtools_event_listeners,
port_reservation.Pass(),
device.Pass()));
const Capabilities& capabilities,
ScopedVector<DevToolsEventListener>& devtools_event_listeners,
scoped_ptr<Chrome>* chrome) {
- if (capabilities.IsExistingBrowser()) {
- return LaunchExistingChromeSession(
+ if (capabilities.IsRemoteBrowser()) {
+ return LaunchRemoteChromeSession(
context_getter, socket_factory,
capabilities, devtools_event_listeners, chrome);
}
std::string GenerateExtensionId(const std::string& input) {
uint8 hash[16];
crypto::SHA256HashString(input, hash, sizeof(hash));
- std::string output = StringToLowerASCII(base::HexEncode(hash, sizeof(hash)));
+ std::string output =
+ base::StringToLowerASCII(base::HexEncode(hash, sizeof(hash)));
ConvertHexadecimalToIDAlphabet(&output);
return output;
}
projects / platform / framework / web / crosswalk.git / blobdiff