| Index: chrome/browser/chromeos/login/screens/screen_context.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/screen_context.cc b/chrome/browser/chromeos/login/screens/screen_context.cc
|
| index 658bd53675b877ce7638fa78a7bad7ec303b772d..e613d31fff4d8980507c2c6cdf0c2f2403e6ce16 100644
|
| --- a/chrome/browser/chromeos/login/screens/screen_context.cc
|
| +++ b/chrome/browser/chromeos/login/screens/screen_context.cc
|
| @@ -98,13 +98,15 @@ void ScreenContext::ApplyChanges(const base::DictionaryValue& diff,
|
| std::vector<std::string>* keys) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(!HasChanges());
|
| - DCHECK(keys);
|
| - keys->clear();
|
| - keys->reserve(diff.size());
|
| + if (keys) {
|
| + keys->clear();
|
| + keys->reserve(diff.size());
|
| + }
|
| base::DictionaryValue::Iterator it(diff);
|
| while (!it.IsAtEnd()) {
|
| Set(it.key(), it.value().DeepCopy());
|
| - keys->push_back(it.key());
|
| + if (keys)
|
| + keys->push_back(it.key());
|
| it.Advance();
|
| }
|
| changes_.Clear();
|
|
|