Chromium Code Reviews| Index: chrome/test/chromedriver/capabilities.cc |
| diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc |
| index 19ccd76bd7a59364b111630e8eec1c4a9925956b..141a63a3bf54f25ecb756f6a06b5764b76664c93 100644 |
| --- a/chrome/test/chromedriver/capabilities.cc |
| +++ b/chrome/test/chromedriver/capabilities.cc |
| @@ -557,6 +557,13 @@ bool Capabilities::IsRemoteBrowser() const { |
| } |
| Status Capabilities::Parse(const base::DictionaryValue& desired_caps) { |
| + // get user prefs and assign to Capabilities prefs |
| + const base::DictionaryValue* _prefs = NULL; |
| + if (desired_caps.GetDictionary("prefs", &_prefs)) { |
| + prefs.reset(new base::DictionaryValue()); |
| + prefs->MergeDictionary(_prefs); |
| + } |
| + // |
|
samuong
2014/10/01 20:22:12
Could you move this out to a separate function and
andrewcheng
2014/10/08 22:08:26
Done.
|
| std::map<std::string, Parser> parser_map; |
| parser_map["chromeOptions"] = base::Bind(&ParseChromeOptions); |
| parser_map["loggingPrefs"] = base::Bind(&ParseLoggingPrefs); |