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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/chromedriver/capabilities.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_
6 #define CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "chrome/test/chromedriver/chrome/log.h"
17 #include "chrome/test/chromedriver/net/net_util.h" 18 #include "chrome/test/chromedriver/net/net_util.h"
18 19
19 namespace base { 20 namespace base {
20 class DictionaryValue; 21 class DictionaryValue;
21 } 22 }
22 23
23 class CommandLine; 24 class CommandLine;
24 class Log;
25 class Status; 25 class Status;
26 26
27 class Switches { 27 class Switches {
28 public: 28 public:
29 typedef base::FilePath::StringType NativeString; 29 typedef base::FilePath::StringType NativeString;
30 Switches(); 30 Switches();
31 ~Switches(); 31 ~Switches();
32 32
33 void SetSwitch(const std::string& name); 33 void SetSwitch(const std::string& name);
34 void SetSwitch(const std::string& name, const std::string& value); 34 void SetSwitch(const std::string& name, const std::string& value);
(...skipping 15 matching lines...) Expand all
50 size_t GetSize() const; 50 size_t GetSize() const;
51 51
52 void AppendToCommandLine(CommandLine* command) const; 52 void AppendToCommandLine(CommandLine* command) const;
53 std::string ToString() const; 53 std::string ToString() const;
54 54
55 private: 55 private:
56 typedef std::map<std::string, NativeString> SwitchMap; 56 typedef std::map<std::string, NativeString> SwitchMap;
57 SwitchMap switch_map_; 57 SwitchMap switch_map_;
58 }; 58 };
59 59
60 typedef std::map<std::string, Log::Level> LoggingPrefs;
61
60 struct Capabilities { 62 struct Capabilities {
61 Capabilities(); 63 Capabilities();
62 ~Capabilities(); 64 ~Capabilities();
63 65
64 // Return true if existing host:port session is to be used. 66 // Return true if existing host:port session is to be used.
65 bool IsExistingBrowser() const; 67 bool IsExistingBrowser() const;
66 68
67 // Return true if android package is specified. 69 // Return true if android package is specified.
68 bool IsAndroid() const; 70 bool IsAndroid() const;
69 71
70 Status Parse(const base::DictionaryValue& desired_caps, Log* log); 72 Status Parse(const base::DictionaryValue& desired_caps);
71 73
72 std::string android_activity; 74 std::string android_activity;
73 75
74 std::string android_device_serial; 76 std::string android_device_serial;
75 77
76 std::string android_package; 78 std::string android_package;
77 79
78 std::string android_process; 80 std::string android_process;
79 81
80 base::FilePath binary; 82 base::FilePath binary;
(...skipping 13 matching lines...) Expand all
94 std::vector<std::string> extensions; 96 std::vector<std::string> extensions;
95 97
96 // True if should always use DevTools for taking screenshots. 98 // True if should always use DevTools for taking screenshots.
97 // This is experimental and may be removed at a later point. 99 // This is experimental and may be removed at a later point.
98 bool force_devtools_screenshot; 100 bool force_devtools_screenshot;
99 101
100 scoped_ptr<base::DictionaryValue> local_state; 102 scoped_ptr<base::DictionaryValue> local_state;
101 103
102 std::string log_path; 104 std::string log_path;
103 105
104 scoped_ptr<base::DictionaryValue> logging_prefs; 106 LoggingPrefs logging_prefs;
105 107
106 scoped_ptr<base::DictionaryValue> prefs; 108 scoped_ptr<base::DictionaryValue> prefs;
107 109
108 Switches switches; 110 Switches switches;
109 }; 111 };
110 112
111 #endif // CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_ 113 #endif // CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_
OLDNEW
« 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