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/commands.h" | 5 #include "chrome/test/chromedriver/commands.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <list> | 8 #include <list> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/linked_ptr.h" | 14 #include "base/memory/linked_ptr.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/message_loop/message_loop_proxy.h" | 16 #include "base/message_loop/message_loop_proxy.h" |
17 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
19 #include "base/sys_info.h" | 19 #include "base/sys_info.h" |
20 #include "base/values.h" | 20 #include "base/values.h" |
21 #include "chrome/test/chromedriver/capabilities.h" | 21 #include "chrome/test/chromedriver/capabilities.h" |
| 22 #include "chrome/test/chromedriver/chrome/browser_info.h" |
22 #include "chrome/test/chromedriver/chrome/chrome.h" | 23 #include "chrome/test/chromedriver/chrome/chrome.h" |
23 #include "chrome/test/chromedriver/chrome/status.h" | 24 #include "chrome/test/chromedriver/chrome/status.h" |
24 #include "chrome/test/chromedriver/chrome/version.h" | 25 #include "chrome/test/chromedriver/chrome/version.h" |
25 #include "chrome/test/chromedriver/logging.h" | 26 #include "chrome/test/chromedriver/logging.h" |
26 #include "chrome/test/chromedriver/session.h" | 27 #include "chrome/test/chromedriver/session.h" |
27 #include "chrome/test/chromedriver/session_thread_map.h" | 28 #include "chrome/test/chromedriver/session_thread_map.h" |
28 #include "chrome/test/chromedriver/util.h" | 29 #include "chrome/test/chromedriver/util.h" |
29 | 30 |
30 void ExecuteGetStatus( | 31 void ExecuteGetStatus( |
31 const base::DictionaryValue& params, | 32 const base::DictionaryValue& params, |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 } | 255 } |
255 } | 256 } |
256 | 257 |
257 namespace internal { | 258 namespace internal { |
258 | 259 |
259 void CreateSessionOnSessionThreadForTesting(const std::string& id) { | 260 void CreateSessionOnSessionThreadForTesting(const std::string& id) { |
260 SetThreadLocalSession(make_scoped_ptr(new Session(id))); | 261 SetThreadLocalSession(make_scoped_ptr(new Session(id))); |
261 } | 262 } |
262 | 263 |
263 } // namespace internal | 264 } // namespace internal |
OLD | NEW |