| Index: chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| index 6ce1eab211e0aa8d0656b15496990eb721e3a6e8..682688ab4b752c136cb8de42833f22af754e5da4 100644
|
| --- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| +++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| @@ -8,9 +8,8 @@
|
| // - The local translation of an object depending on the associated signature
|
| // see LocalTranslator::TranslateFields
|
|
|
| -#include "chromeos/network/onc/onc_translator.h"
|
| -
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| @@ -20,6 +19,7 @@
|
| #include "base/values.h"
|
| #include "chromeos/network/onc/onc_signature.h"
|
| #include "chromeos/network/onc/onc_translation_tables.h"
|
| +#include "chromeos/network/onc/onc_translator.h"
|
| #include "chromeos/network/onc/onc_utils.h"
|
| #include "chromeos/network/shill_property_util.h"
|
| #include "components/onc/onc_constants.h"
|
| @@ -175,7 +175,7 @@ void LocalTranslator::TranslateOpenVPN() {
|
| // Shill wants all Provider/VPN fields to be strings.
|
| translated = ConvertValueToString(it.value());
|
| }
|
| - AddValueAccordingToSignature(it.key(), translated.Pass());
|
| + AddValueAccordingToSignature(it.key(), std::move(translated));
|
| }
|
| }
|
|
|
| @@ -421,7 +421,7 @@ scoped_ptr<base::DictionaryValue> TranslateONCObjectToShill(
|
| CHECK(onc_signature != NULL);
|
| scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
|
| TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
|
| - return shill_dictionary.Pass();
|
| + return shill_dictionary;
|
| }
|
|
|
| } // namespace onc
|
|
|