Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Side by Side Diff: chrome/browser/extensions/api/bluetooth_low_energy/utils.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/bluetooth_low_energy/utils.h" 5 #include "chrome/browser/extensions/api/bluetooth_low_energy/utils.h"
6 6
7 namespace extensions { 7 namespace extensions {
8 namespace api { 8 namespace api {
9 namespace bluetooth_low_energy { 9 namespace bluetooth_low_energy {
10 10
11 namespace { 11 namespace {
12 12
13 // Converts a list of CharacteristicProperty to a base::ListValue of strings. 13 // Converts a list of CharacteristicProperty to a base::ListValue of strings.
14 scoped_ptr<base::ListValue> CharacteristicPropertiesToValue( 14 scoped_ptr<base::ListValue> CharacteristicPropertiesToValue(
15 const std::vector<CharacteristicProperty> properties) { 15 const std::vector<CharacteristicProperty> properties) {
16 scoped_ptr<base::ListValue> property_list(new base::ListValue()); 16 scoped_ptr<base::ListValue> property_list(new base::ListValue());
17 for (std::vector<CharacteristicProperty>::const_iterator iter = 17 for (std::vector<CharacteristicProperty>::const_iterator iter =
18 properties.begin(); 18 properties.begin();
19 iter != properties.end(); 19 iter != properties.end();
20 ++iter) 20 ++iter)
21 property_list->Append(new base::StringValue(ToString(*iter))); 21 property_list->Append(new base::StringValue(ToString(*iter)));
22 return property_list.Pass(); 22 return property_list;
23 } 23 }
24 24
25 } // namespace 25 } // namespace
26 26
27 scoped_ptr<base::DictionaryValue> CharacteristicToValue(Characteristic* from) { 27 scoped_ptr<base::DictionaryValue> CharacteristicToValue(Characteristic* from) {
28 // Copy the properties. Use Characteristic::ToValue to generate the result 28 // Copy the properties. Use Characteristic::ToValue to generate the result
29 // dictionary without the properties, to prevent json_schema_compiler from 29 // dictionary without the properties, to prevent json_schema_compiler from
30 // failing. 30 // failing.
31 std::vector<CharacteristicProperty> properties = from->properties; 31 std::vector<CharacteristicProperty> properties = from->properties;
32 from->properties.clear(); 32 from->properties.clear();
33 scoped_ptr<base::DictionaryValue> to = from->ToValue(); 33 scoped_ptr<base::DictionaryValue> to = from->ToValue();
34 to->SetWithoutPathExpansion( 34 to->SetWithoutPathExpansion(
35 "properties", CharacteristicPropertiesToValue(properties).release()); 35 "properties", CharacteristicPropertiesToValue(properties).release());
36 return to.Pass(); 36 return to;
37 } 37 }
38 38
39 scoped_ptr<base::DictionaryValue> DescriptorToValue(Descriptor* from) { 39 scoped_ptr<base::DictionaryValue> DescriptorToValue(Descriptor* from) {
40 // Copy the characteristic properties and set them later manually. 40 // Copy the characteristic properties and set them later manually.
41 std::vector<CharacteristicProperty> properties = 41 std::vector<CharacteristicProperty> properties =
42 from->characteristic.properties; 42 from->characteristic.properties;
43 from->characteristic.properties.clear(); 43 from->characteristic.properties.clear();
44 scoped_ptr<base::DictionaryValue> to = from->ToValue(); 44 scoped_ptr<base::DictionaryValue> to = from->ToValue();
45 45
46 base::DictionaryValue* chrc_value = NULL; 46 base::DictionaryValue* chrc_value = NULL;
47 to->GetDictionaryWithoutPathExpansion("characteristic", &chrc_value); 47 to->GetDictionaryWithoutPathExpansion("characteristic", &chrc_value);
48 DCHECK(chrc_value); 48 DCHECK(chrc_value);
49 chrc_value->SetWithoutPathExpansion( 49 chrc_value->SetWithoutPathExpansion(
50 "properties", CharacteristicPropertiesToValue(properties).release()); 50 "properties", CharacteristicPropertiesToValue(properties).release());
51 return to.Pass(); 51 return to;
52 } 52 }
53 53
54 } // namespace bluetooth_low_energy 54 } // namespace bluetooth_low_energy
55 } // namespace api 55 } // namespace api
56 } // namespace extensions 56 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698