| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/session_commands.h" | 5 #include "chrome/test/chromedriver/session_commands.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/test/chromedriver/chrome/chrome.h" | 21 #include "chrome/test/chromedriver/chrome/chrome.h" |
| 22 #include "chrome/test/chromedriver/chrome/chrome_android_impl.h" | 22 #include "chrome/test/chromedriver/chrome/chrome_android_impl.h" |
| 23 #include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h" | 23 #include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h" |
| 24 #include "chrome/test/chromedriver/chrome/device_manager.h" | 24 #include "chrome/test/chromedriver/chrome/device_manager.h" |
| 25 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" | 25 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" |
| 26 #include "chrome/test/chromedriver/chrome/geoposition.h" | 26 #include "chrome/test/chromedriver/chrome/geoposition.h" |
| 27 #include "chrome/test/chromedriver/chrome/status.h" | 27 #include "chrome/test/chromedriver/chrome/status.h" |
| 28 #include "chrome/test/chromedriver/chrome/version.h" | 28 #include "chrome/test/chromedriver/chrome/version.h" |
| 29 #include "chrome/test/chromedriver/chrome/web_view.h" | 29 #include "chrome/test/chromedriver/chrome/web_view.h" |
| 30 #include "chrome/test/chromedriver/chrome_launcher.h" | 30 #include "chrome/test/chromedriver/chrome_launcher.h" |
| 31 #include "chrome/test/chromedriver/command_listener.h" | |
| 32 #include "chrome/test/chromedriver/logging.h" | 31 #include "chrome/test/chromedriver/logging.h" |
| 33 #include "chrome/test/chromedriver/net/url_request_context_getter.h" | 32 #include "chrome/test/chromedriver/net/url_request_context_getter.h" |
| 34 #include "chrome/test/chromedriver/session.h" | 33 #include "chrome/test/chromedriver/session.h" |
| 35 #include "chrome/test/chromedriver/util.h" | 34 #include "chrome/test/chromedriver/util.h" |
| 36 #include "chrome/test/chromedriver/version.h" | 35 #include "chrome/test/chromedriver/version.h" |
| 37 | 36 |
| 38 namespace { | 37 namespace { |
| 39 | 38 |
| 40 const char kWindowHandlePrefix[] = "CDwindow-"; | 39 const char kWindowHandlePrefix[] = "CDwindow-"; |
| 41 | 40 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 if (status.IsError()) | 117 if (status.IsError()) |
| 119 return status; | 118 return status; |
| 120 | 119 |
| 121 Log::Level driver_level = Log::kWarning; | 120 Log::Level driver_level = Log::kWarning; |
| 122 if (capabilities.logging_prefs.count(WebDriverLog::kDriverType)) | 121 if (capabilities.logging_prefs.count(WebDriverLog::kDriverType)) |
| 123 driver_level = capabilities.logging_prefs[WebDriverLog::kDriverType]; | 122 driver_level = capabilities.logging_prefs[WebDriverLog::kDriverType]; |
| 124 session->driver_log->set_min_level(driver_level); | 123 session->driver_log->set_min_level(driver_level); |
| 125 | 124 |
| 126 // Create Log's and DevToolsEventListener's for ones that are DevTools-based. | 125 // Create Log's and DevToolsEventListener's for ones that are DevTools-based. |
| 127 // Session will own the Log's, Chrome will own the listeners. | 126 // Session will own the Log's, Chrome will own the listeners. |
| 128 // Also create |CommandListener|s for the appropriate logs. | |
| 129 ScopedVector<DevToolsEventListener> devtools_event_listeners; | 127 ScopedVector<DevToolsEventListener> devtools_event_listeners; |
| 130 ScopedVector<CommandListener> command_listeners; | |
| 131 status = CreateLogs(capabilities, | 128 status = CreateLogs(capabilities, |
| 132 &session->devtools_logs, | 129 &session->devtools_logs, |
| 133 &devtools_event_listeners, &command_listeners); | 130 &devtools_event_listeners); |
| 134 if (status.IsError()) | 131 if (status.IsError()) |
| 135 return status; | 132 return status; |
| 136 | 133 |
| 137 // |session| will own the |CommandListener|s. | |
| 138 session->command_listeners.swap(command_listeners); | |
| 139 | |
| 140 status = LaunchChrome(bound_params.context_getter.get(), | 134 status = LaunchChrome(bound_params.context_getter.get(), |
| 141 bound_params.socket_factory, | 135 bound_params.socket_factory, |
| 142 bound_params.device_manager, | 136 bound_params.device_manager, |
| 143 bound_params.port_server, | 137 bound_params.port_server, |
| 144 bound_params.port_manager, | 138 bound_params.port_manager, |
| 145 capabilities, | 139 capabilities, |
| 146 devtools_event_listeners, | 140 devtools_event_listeners, |
| 147 &session->chrome); | 141 &session->chrome); |
| 148 if (status.IsError()) | 142 if (status.IsError()) |
| 149 return status; | 143 return status; |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 Status ExecuteSetAutoReporting( | 645 Status ExecuteSetAutoReporting( |
| 652 Session* session, | 646 Session* session, |
| 653 const base::DictionaryValue& params, | 647 const base::DictionaryValue& params, |
| 654 scoped_ptr<base::Value>* value) { | 648 scoped_ptr<base::Value>* value) { |
| 655 bool enabled; | 649 bool enabled; |
| 656 if (!params.GetBoolean("enabled", &enabled)) | 650 if (!params.GetBoolean("enabled", &enabled)) |
| 657 return Status(kUnknownError, "missing parameter 'enabled'"); | 651 return Status(kUnknownError, "missing parameter 'enabled'"); |
| 658 session->auto_reporting_enabled = enabled; | 652 session->auto_reporting_enabled = enabled; |
| 659 return Status(kOk); | 653 return Status(kOk); |
| 660 } | 654 } |
| OLD | NEW |