Logging API in chromedriver2.

chrome/test/chromedriver/session_commands.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/session_commands.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"  // For CHECK macros.
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/basic_types.h"
 #include "chrome/test/chromedriver/chrome/automation_extension.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
+#include "chrome/test/chromedriver/chrome/devtools_event_logger.h"
 #include "chrome/test/chromedriver/chrome/geoposition.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/session.h"
 #include "chrome/test/chromedriver/session_map.h"
 
 namespace {
 
 const char kWindowHandlePrefix[] = "CDwindow-";
 
@@ skipping 435 matching lines @@
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   AutomationExtension* extension = NULL;
   Status status = session->chrome->GetAutomationExtension(&extension);
   if (status.IsError())
     return status;
 
   return extension->MaximizeWindow();
 }
+
+Status ExecuteGetAvailableLogTypes(
+    Session* session,
+    const base::DictionaryValue& params,
+    scoped_ptr<base::Value>* value) {
+  if (params.size() != 0) {

[kkania, 2013/04/18 17:34:39]

remove this; we don't bother checking this anywhere else

[klm, 2013/04/18 19:11:31]

Done.

+    return Status(kUnknownError, "unexpected parameters");
+  }
+  scoped_ptr<ListValue> types(new base::ListValue());
+  for (ScopedVector<DevToolsEventLogger>::const_iterator logger =
+       session->devtools_event_loggers.begin();
+       logger != session->devtools_event_loggers.end(); ++logger) {
+    types->AppendString((*logger)->GetLogType());
+  }
+  value->reset(types.release());
+  return Status(kOk);
+}
+
+Status ExecuteGetLog(
+    Session* session,
+    const base::DictionaryValue& params,
+    scoped_ptr<base::Value>* value) {
+  if (params.size() != 1) {

[kkania, 2013/04/18 17:34:39]

remove this

[klm, 2013/04/18 19:11:31]

Done.

+    return Status(kUnknownError, "unexpected parameters");
+  }
+  std::string log_type;
+  if (!params.GetString("type", &log_type)) {
+    return Status(kUnknownError, "missing or invalid 'type'");
+  }
+  for (ScopedVector<DevToolsEventLogger>::const_iterator logger =
+       session->devtools_event_loggers.begin();
+       logger != session->devtools_event_loggers.end(); ++logger) {
+    if (log_type == (*logger)->GetLogType()) {
+      scoped_ptr<ListValue> log_entries = (*logger)->GetAndClearLogEntries();
+      value->reset(log_entries.release());
+      return Status(kOk);
+    }
+  }
+  return Status(kUnknownError, "log type '" + log_type + "' not found");
+}