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

Unified Diff: chrome/test/chromedriver/logging.h

Issue 23566018: [chromedriver] Remove Logger and just use base LOG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 7 years, 3 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/commands.cc ('k') | chrome/test/chromedriver/logging.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/logging.h
diff --git a/chrome/test/chromedriver/logging.h b/chrome/test/chromedriver/logging.h
index 9c741b59841e0dad0e5eb9a49525ebbd961dc9ec..bfea30c41fa2343dc75250f48aba873bd2000963 100644
--- a/chrome/test/chromedriver/logging.h
+++ b/chrome/test/chromedriver/logging.h
@@ -22,26 +22,13 @@ class Status;
// See https://code.google.com/p/selenium/wiki/Logging.
class WebDriverLog : public Log {
public:
- // Constants corresponding to log entry severity levels in the wire protocol.
- enum WebDriverLevel {
- kWdAll,
- kWdDebug,
- kWdInfo,
- kWdWarning,
- kWdSevere,
- kWdOff
- };
-
- // Converts WD wire protocol level name -> WebDriverLevel, false on bad name.
- static bool NameToLevel(const std::string& name, WebDriverLevel* out_level);
+ // Converts WD wire protocol level name -> Level, false on bad name.
+ static bool NameToLevel(const std::string& name, Level* out_level);
// Creates a WebDriverLog with the given type and minimum level.
- WebDriverLog(const std::string& type, WebDriverLevel min_wd_level);
+ WebDriverLog(const std::string& type, Level min_level);
virtual ~WebDriverLog();
- // Returns this log's type, for the WD wire protocol "/log" and "/log/types".
- const std::string& GetType();
-
// Returns entries accumulated so far, as a ListValue ready for serialization
// into the wire protocol response to the "/log" command.
// The caller assumes ownership of the ListValue, and the WebDriverLog
@@ -53,17 +40,24 @@ class WebDriverLog : public Log {
Level level,
const std::string& message) OVERRIDE;
+ const std::string& type() const;
+ Level min_level() const;
+
private:
const std::string type_; // WebDriver log type.
- const WebDriverLevel min_wd_level_; // Minimum level of entries to store.
+ const Level min_level_; // Minimum level of entries to store.
scoped_ptr<base::ListValue> entries_; // Accumulated entries.
DISALLOW_COPY_AND_ASSIGN(WebDriverLog);
};
-// Creates Log's and DevToolsEventListener's for ones that are DevTools-based.
+// Initializes logging system for ChromeDriver. Returns true on success.
+bool InitLogging();
+
+// Creates Log's and DevToolsEventListener's based on logging preferences.
Status CreateLogs(const Capabilities& capabilities,
- ScopedVector<WebDriverLog>* out_devtools_logs,
+ ScopedVector<WebDriverLog>* out_logs,
+ scoped_ptr<WebDriverLog>* out_driver_log,
ScopedVector<DevToolsEventListener>* out_listeners);
#endif // CHROME_TEST_CHROMEDRIVER_LOGGING_H_
« no previous file with comments | « chrome/test/chromedriver/commands.cc ('k') | chrome/test/chromedriver/logging.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698