| Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| index 62aa868ec2149032b01fe2af0306a8e9302a00cd..a5a5b9b394f354fae98d9c9fd94cfd37826954e1 100644
|
| --- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| +++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
|
| @@ -2,9 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chromeos/network/onc/onc_translator.h"
|
| -
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| @@ -17,6 +16,7 @@
|
| #include "chromeos/network/network_util.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"
|
| @@ -183,7 +183,7 @@ ShillToONCTranslator::CreateTranslatedONCObject() {
|
| } else {
|
| CopyPropertiesAccordingToSignature();
|
| }
|
| - return onc_object_.Pass();
|
| + return std::move(onc_object_);
|
| }
|
|
|
| void ShillToONCTranslator::TranslateEthernet() {
|
|
|