OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/chromedriver/command_executor_impl.h" | 5 #include "chrome/test/chromedriver/command_executor_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/message_loop_proxy.h" | 10 #include "base/message_loop_proxy.h" |
11 #include "base/stringprintf.h" | 11 #include "base/stringprintf.h" |
12 #include "base/sys_info.h" | 12 #include "base/sys_info.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/test/chromedriver/chrome/status.h" |
| 15 #include "chrome/test/chromedriver/chrome/version.h" |
14 #include "chrome/test/chromedriver/command_names.h" | 16 #include "chrome/test/chromedriver/command_names.h" |
15 #include "chrome/test/chromedriver/commands.h" | 17 #include "chrome/test/chromedriver/commands.h" |
16 #include "chrome/test/chromedriver/element_commands.h" | 18 #include "chrome/test/chromedriver/element_commands.h" |
17 #include "chrome/test/chromedriver/net/url_request_context_getter.h" | 19 #include "chrome/test/chromedriver/net/url_request_context_getter.h" |
18 #include "chrome/test/chromedriver/session.h" | 20 #include "chrome/test/chromedriver/session.h" |
19 #include "chrome/test/chromedriver/session_commands.h" | 21 #include "chrome/test/chromedriver/session_commands.h" |
20 #include "chrome/test/chromedriver/session_map.h" | 22 #include "chrome/test/chromedriver/session_map.h" |
21 #include "chrome/test/chromedriver/status.h" | |
22 #include "chrome/test/chromedriver/version.h" | |
23 #include "chrome/test/chromedriver/window_commands.h" | 23 #include "chrome/test/chromedriver/window_commands.h" |
24 | 24 |
25 #if defined(OS_MACOSX) | 25 #if defined(OS_MACOSX) |
26 #include "base/mac/scoped_nsautorelease_pool.h" | 26 #include "base/mac/scoped_nsautorelease_pool.h" |
27 #endif | 27 #endif |
28 | 28 |
29 namespace { | 29 namespace { |
30 | 30 |
31 const char kLocalStorage[] = "localStorage"; | 31 const char kLocalStorage[] = "localStorage"; |
32 const char kSessionStorage[] = "sessionStorage"; | 32 const char kSessionStorage[] = "sessionStorage"; |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 base::SysInfo::OperatingSystemName().c_str(), | 264 base::SysInfo::OperatingSystemName().c_str(), |
265 base::SysInfo::OperatingSystemVersion().c_str(), | 265 base::SysInfo::OperatingSystemVersion().c_str(), |
266 base::SysInfo::OperatingSystemArchitecture().c_str())); | 266 base::SysInfo::OperatingSystemArchitecture().c_str())); |
267 scoped_ptr<base::DictionaryValue> error(new base::DictionaryValue()); | 267 scoped_ptr<base::DictionaryValue> error(new base::DictionaryValue()); |
268 error->SetString("message", status.message()); | 268 error->SetString("message", status.message()); |
269 value->reset(error.release()); | 269 value->reset(error.release()); |
270 } | 270 } |
271 if (!*value) | 271 if (!*value) |
272 value->reset(base::Value::CreateNullValue()); | 272 value->reset(base::Value::CreateNullValue()); |
273 } | 273 } |
OLD | NEW |