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

Unified Diff: chrome/test/chromedriver/capabilities.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/chrome_tests.gypi ('k') | chrome/test/chromedriver/capabilities.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/capabilities.h
diff --git a/chrome/test/chromedriver/capabilities.h b/chrome/test/chromedriver/capabilities.h
index 7c37ee03248fe38e92b6eb9592b545e3eae52ff4..d23740eceeac239fb43164bf35de67cf796635c3 100644
--- a/chrome/test/chromedriver/capabilities.h
+++ b/chrome/test/chromedriver/capabilities.h
@@ -14,6 +14,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
+#include "chrome/test/chromedriver/chrome/log.h"
#include "chrome/test/chromedriver/net/net_util.h"
namespace base {
@@ -21,7 +22,6 @@ class DictionaryValue;
}
class CommandLine;
-class Log;
class Status;
class Switches {
@@ -57,6 +57,8 @@ class Switches {
SwitchMap switch_map_;
};
+typedef std::map<std::string, Log::Level> LoggingPrefs;
+
struct Capabilities {
Capabilities();
~Capabilities();
@@ -67,7 +69,7 @@ struct Capabilities {
// Return true if android package is specified.
bool IsAndroid() const;
- Status Parse(const base::DictionaryValue& desired_caps, Log* log);
+ Status Parse(const base::DictionaryValue& desired_caps);
std::string android_activity;
@@ -101,7 +103,7 @@ struct Capabilities {
std::string log_path;
- scoped_ptr<base::DictionaryValue> logging_prefs;
+ LoggingPrefs logging_prefs;
scoped_ptr<base::DictionaryValue> prefs;
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/chromedriver/capabilities.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698