Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3261)

Unified Diff: chrome/test/chromedriver/commands.cc

Issue 14263024: Logging API in chromedriver2. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/command_executor_impl.cc ('k') | chrome/test/chromedriver/logging.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/commands.cc
===================================================================
--- chrome/test/chromedriver/commands.cc (revision 194993)
+++ chrome/test/chromedriver/commands.cc (working copy)
@@ -4,6 +4,8 @@
#include "chrome/test/chromedriver/commands.h"
+#include <list>
+
#include "base/stringprintf.h"
#include "base/sys_info.h"
#include "base/values.h"
@@ -11,10 +13,12 @@
#include "chrome/test/chromedriver/chrome/chrome.h"
#include "chrome/test/chromedriver/chrome/chrome_android_impl.h"
#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h"
+#include "chrome/test/chromedriver/chrome/devtools_event_logger.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/version.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
#include "chrome/test/chromedriver/chrome_launcher.h"
+#include "chrome/test/chromedriver/logging.h"
#include "chrome/test/chromedriver/net/net_util.h"
#include "chrome/test/chromedriver/net/url_request_context_getter.h"
#include "chrome/test/chromedriver/session.h"
@@ -62,9 +66,17 @@
if (status.IsError())
return status;
+ // Create DevToolsEventLoggers, fail if log levels are invalid.
+ ScopedVector<DevToolsEventLogger> devtools_event_loggers;
+ status = CreateLoggers(capabilities, &devtools_event_loggers);
+ if (status.IsError())
+ return status;
+
scoped_ptr<Chrome> chrome;
+ std::list<DevToolsEventLogger*> devtools_event_logger_list(
+ devtools_event_loggers.begin(), devtools_event_loggers.end());
status = LaunchChrome(context_getter, port, socket_factory,
- capabilities, &chrome);
+ capabilities, devtools_event_logger_list, &chrome);
if (status.IsError())
return status;
@@ -80,6 +92,7 @@
if (new_id.empty())
new_id = GenerateId();
scoped_ptr<Session> session(new Session(new_id, chrome.Pass()));
+ session->devtools_event_loggers.swap(devtools_event_loggers);
if (!session->thread.Start()) {
chrome->Quit();
return Status(kUnknownError,
« no previous file with comments | « chrome/test/chromedriver/command_executor_impl.cc ('k') | chrome/test/chromedriver/logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698