Convert various vector_as_array calls to vector::data.

device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
 namespace {
@@ skipping 310 matching lines @@
   void AppendManufacturerDataVariant(dbus::MessageWriter* writer) {
     DCHECK(manufacturer_data_);
     dbus::MessageWriter array_writer(NULL);
     writer->OpenArray("{qay}", &array_writer);
     for (const auto& m : *manufacturer_data_) {
       dbus::MessageWriter entry_writer(NULL);
 
       array_writer.OpenDictEntry(&entry_writer);
 
       entry_writer.AppendUint32(m.first);
-      entry_writer.AppendArrayOfBytes(vector_as_array(&m.second),
-                                      m.second.size());
+      entry_writer.AppendArrayOfBytes(m.second.data(), m.second.size());
 
       array_writer.CloseContainer(&entry_writer);
     }
     writer->CloseContainer(&array_writer);
   }
 
   void AppendServiceDataVariant(dbus::MessageWriter* writer) {
     DCHECK(service_data_);
     dbus::MessageWriter array_writer(NULL);
     writer->OpenArray("{say}", &array_writer);
     for (const auto& m : *service_data_) {
       dbus::MessageWriter entry_writer(NULL);
 
       array_writer.OpenDictEntry(&entry_writer);
 
       entry_writer.AppendString(m.first);
-      entry_writer.AppendArrayOfBytes(vector_as_array(&m.second),
-                                      m.second.size());
+      entry_writer.AppendArrayOfBytes(m.second.data(), m.second.size());
 
       array_writer.CloseContainer(&entry_writer);
     }
     writer->CloseContainer(&array_writer);
   }
 
   // Origin thread (i.e. the UI thread in production).
   base::PlatformThreadId origin_thread_id_;
 
   // D-Bus bus object is exported on, not owned by this object and must
@@ skipping 46 matching lines @@
     return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
         bus, object_path, delegate, type, service_uuids.Pass(),
         manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass()));
   } else {
     return make_scoped_ptr(
         new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));
   }
 }
 
 }  // namespace bluez