bluetooth-advertising: Fix wrong assignment and append of wrong type

bluetooth-advertising: Fix wrong assignment and append of wrong type

The assignment statements where flipped so service data was always null.

Also the wrong function was being used to append to the writer which
caused chrome to crash.

BUG=525313
Committed: https://crrev.com/945c90df408fc010d5e56e0768881d26e451adad
Cr-Commit-Position: refs/heads/master@{#346555}

[ortuno, 2015-08-27 01:41:42]

ortuno@chromium.org changed reviewers:
+ armansito@chromium.org

[ortuno, 2015-08-27 01:41:42]

Thanks for the help in debugging! PTAL

[ortuno, 2015-08-27 01:41:48]

The CQ bit was checked by ortuno@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-08-27 01:42:34]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1317933003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1317933003/1

[armansito, 2015-08-27 02:11:43]

https://codereview.chromium.org/1317933003/diff/1/device/bluetooth/bluetooth_...
File device/bluetooth/bluetooth_advertisement.h (right):

https://codereview.chromium.org/1317933003/diff/1/device/bluetooth/bluetooth_...
device/bluetooth/bluetooth_advertisement.h:77: service_data_ =
service_data.Pass();
Can you add unit tests for these?

[commit-bot: I haz the power, 2015-08-27 03:02:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-27 03:02:06]

Dry run: This issue passed the CQ dry run.

[ortuno, 2015-08-27 19:46:59]

Ready for review

https://codereview.chromium.org/1317933003/diff/1/device/bluetooth/bluetooth_...
File device/bluetooth/bluetooth_advertisement.h (right):

https://codereview.chromium.org/1317933003/diff/1/device/bluetooth/bluetooth_...
device/bluetooth/bluetooth_advertisement.h:77: service_data_ =
service_data.Pass();
On 2015/08/27 at 02:11:43, armansito wrote:
> Can you add unit tests for these?

Done.

[armansito, 2015-08-28 21:56:17]

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
File device/bluetooth/bluetooth_advertisement_unittest.cc (right):

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
device/bluetooth/bluetooth_advertisement_unittest.cc:8: using
device::BluetoothAdvertisement;
You declared "namespace device" below. You don't need this using statement.

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
device/bluetooth/bluetooth_advertisement_unittest.cc:10: namespace device {
Add empty line after this. Also, did you mean to declare an anonymous namespace
here?

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
device/bluetooth/bluetooth_advertisement_unittest.cc:67: }  // namespace
}  // namespace device?

https://codereview.chromium.org/1317933003/diff/20001/device/device_tests.gyp
File device/device_tests.gyp (right):

https://codereview.chromium.org/1317933003/diff/20001/device/device_tests.gyp...
device/device_tests.gyp:43: 'bluetooth/bluetooth_advertisement_unittest.cc',
You'll need to update device/BUILD.gn as well.

[ortuno, 2015-09-01 00:24:30]

PTAL

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
File device/bluetooth/bluetooth_advertisement_unittest.cc (right):

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
device/bluetooth/bluetooth_advertisement_unittest.cc:8: using
device::BluetoothAdvertisement;
On 2015/08/28 at 21:56:16, armansito wrote:
> You declared "namespace device" below. You don't need this using statement.

Done.

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
device/bluetooth/bluetooth_advertisement_unittest.cc:10: namespace device {
On 2015/08/28 at 21:56:16, armansito wrote:
> Add empty line after this. Also, did you mean to declare an anonymous
namespace here?

Done.

https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
device/bluetooth/bluetooth_advertisement_unittest.cc:67: }  // namespace
On 2015/08/28 at 21:56:16, armansito wrote:
> }  // namespace device?

Done.

https://codereview.chromium.org/1317933003/diff/20001/device/device_tests.gyp
File device/device_tests.gyp (right):

https://codereview.chromium.org/1317933003/diff/20001/device/device_tests.gyp...
device/device_tests.gyp:43: 'bluetooth/bluetooth_advertisement_unittest.cc',
On 2015/08/28 at 21:56:17, armansito wrote:
> You'll need to update device/BUILD.gn as well.

Done. Weird that all the bots passed...

[ortuno, 2015-09-01 00:24:33]

The CQ bit was checked by ortuno@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-09-01 00:24:40]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1317933003/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1317933003/40001

[armansito, 2015-09-01 00:25:32]

On 2015/09/01 00:24:30, ortuno wrote:
> PTAL
> 
>
https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
> File device/bluetooth/bluetooth_advertisement_unittest.cc (right):
> 
>
https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
> device/bluetooth/bluetooth_advertisement_unittest.cc:8: using
> device::BluetoothAdvertisement;
> On 2015/08/28 at 21:56:16, armansito wrote:
> > You declared "namespace device" below. You don't need this using statement.
> 
> Done.
> 
>
https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
> device/bluetooth/bluetooth_advertisement_unittest.cc:10: namespace device {
> On 2015/08/28 at 21:56:16, armansito wrote:
> > Add empty line after this. Also, did you mean to declare an anonymous
> namespace here?
> 
> Done.
> 
>
https://codereview.chromium.org/1317933003/diff/20001/device/bluetooth/blueto...
> device/bluetooth/bluetooth_advertisement_unittest.cc:67: }  // namespace
> On 2015/08/28 at 21:56:16, armansito wrote:
> > }  // namespace device?
> 
> Done.
> 
> https://codereview.chromium.org/1317933003/diff/20001/device/device_tests.gyp
> File device/device_tests.gyp (right):
> 
>
https://codereview.chromium.org/1317933003/diff/20001/device/device_tests.gyp...
> device/device_tests.gyp:43: 'bluetooth/bluetooth_advertisement_unittest.cc',
> On 2015/08/28 at 21:56:17, armansito wrote:
> > You'll need to update device/BUILD.gn as well.
> 
> Done. Weird that all the bots passed...

That makes sense. On GN bots I bet your test didn't even run

[armansito, 2015-09-01 00:26:10]

lgtm

[commit-bot: I haz the power, 2015-09-01 01:08:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-01 01:08:15]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[ortuno, 2015-09-01 01:13:21]

The CQ bit was checked by ortuno@chromium.org

[commit-bot: I haz the power, 2015-09-01 01:13:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1317933003/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1317933003/40001

[commit-bot: I haz the power, 2015-09-01 01:47:13]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-09-01 01:47:49]

Patchset 3 (id:??) landed as
https://crrev.com/945c90df408fc010d5e56e0768881d26e451adad
Cr-Commit-Position: refs/heads/master@{#346555}