| Index: chrome/test/chromedriver/chrome/network_conditions.cc
|
| diff --git a/chrome/test/chromedriver/chrome/network_conditions.cc b/chrome/test/chromedriver/chrome/network_conditions.cc
|
| index cea692162ed8d55ced1e145af3607c512829155b..99092568e975caf28442c8e714f9a4707ec6a11c 100644
|
| --- a/chrome/test/chromedriver/chrome/network_conditions.cc
|
| +++ b/chrome/test/chromedriver/chrome/network_conditions.cc
|
| @@ -24,9 +24,8 @@ NetworkConditions::~NetworkConditions() {}
|
| Status FindPresetNetwork(std::string network_name,
|
| NetworkConditions* network_conditions) {
|
| base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS);
|
| - scoped_ptr<base::Value> networks_value;
|
| - networks_value.reset(json_reader.ReadToValue(kNetworks));
|
| - if (!networks_value.get())
|
| + scoped_ptr<base::Value> networks_value = json_reader.ReadToValue(kNetworks);
|
| + if (!networks_value)
|
| return Status(kUnknownError,
|
| "could not parse network list because " +
|
| json_reader.GetErrorMessage());
|
| @@ -38,7 +37,6 @@ Status FindPresetNetwork(std::string network_name,
|
| for (base::ListValue::iterator it = networks->begin();
|
| it != networks->end();
|
| ++it) {
|
| -
|
| base::DictionaryValue* network = NULL;
|
| if (!(*it)->GetAsDictionary(&network)) {
|
| return Status(kUnknownError,
|
|
|