Index: chrome/test/chromedriver/chrome_launcher.cc |
diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc |
index ffc24283a8ccb1c37071241c1e607d0b4b081a5f..a4b57951dbb39b4d297218c2b6076e26d92ff959 100644 |
--- a/chrome/test/chromedriver/chrome_launcher.cc |
+++ b/chrome/test/chromedriver/chrome_launcher.cc |
@@ -156,9 +156,16 @@ Status WaitForDevToolsAndCheckVersion( |
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()); |
+ *device_metrics = *capabilities->device_metrics; |
samuong
2014/05/16 23:00:35
Change these two lines to:
device_metrics.reset(n
sam.rawlins
2014/05/16 23:35:51
Done.
|
+ } |
+ |
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()); |
@@ -193,7 +200,7 @@ Status LaunchExistingChromeSession( |
scoped_ptr<DevToolsHttpClient> devtools_client; |
status = WaitForDevToolsAndCheckVersion( |
capabilities.debugger_address, context_getter, socket_factory, |
- &devtools_client); |
+ NULL, &devtools_client); |
if (status.IsError()) { |
return Status(kUnknownError, "cannot connect to chrome at " + |
capabilities.debugger_address.ToString(), |
@@ -277,7 +284,8 @@ Status LaunchDesktopChrome( |
scoped_ptr<DevToolsHttpClient> devtools_client; |
status = WaitForDevToolsAndCheckVersion( |
- NetAddress(port), context_getter, socket_factory, &devtools_client); |
+ NetAddress(port), context_getter, socket_factory, &capabilities, |
+ &devtools_client); |
if (status.IsError()) { |
int exit_code; |
@@ -377,6 +385,7 @@ Status LaunchAndroidChrome( |
status = WaitForDevToolsAndCheckVersion(NetAddress(port), |
context_getter, |
socket_factory, |
+ &capabilities, |
&devtools_client); |
if (status.IsError()) { |
device->TearDown(); |