Bluetooth: Profile support for Chrome OS

chromeos/dbus/experimental_bluetooth_profile_service_provider.cc

 // Copyright (c) 2013 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 "chromeos/dbus/experimental_bluetooth_profile_service_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 95 matching lines @@
 
   // Called by dbus:: when the Bluetooth daemon establishes a new connection
   // to the profile.
   void NewConnection(dbus::MethodCall* method_call,
                      dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(OnOriginThread());
     DCHECK(delegate_);
 
     dbus::MessageReader reader(method_call);
     dbus::ObjectPath device_path;
-    dbus::FileDescriptor fd;
+    scoped_ptr<dbus::FileDescriptor> fd(new dbus::FileDescriptor());
     dbus::MessageReader array_reader(NULL);
     if (!reader.PopObjectPath(&device_path) ||
-        !reader.PopFileDescriptor(&fd) ||
+        !reader.PopFileDescriptor(fd.get()) ||
         !reader.PopArray(&array_reader)) {
       LOG(WARNING) << "NewConnection called with incorrect paramters: "
                    << method_call->ToString();
       return;
     }
 
     Delegate::Options options;
     while (array_reader.HasMoreData()) {
       dbus::MessageReader dict_entry_reader(NULL);
       std::string key;
       if (!array_reader.PopDictEntry(&dict_entry_reader) ||
           !dict_entry_reader.PopString(&key)) {
         LOG(WARNING) << "NewConnection called with incorrect paramters: "
                      << method_call->ToString();
       } else {
         if (key == bluetooth_profile::kVersionProperty)
           dict_entry_reader.PopVariantOfUint16(&options.version);
         else if (key == bluetooth_profile::kFeaturesProperty)
           dict_entry_reader.PopVariantOfUint16(&options.features);
       }
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
         &ExperimentalBluetoothProfileServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
 
-    delegate_->NewConnection(device_path, &fd, options, callback);
-
-    response_sender.Run(dbus::Response::FromMethodCall(method_call));
+    delegate_->NewConnection(device_path, fd.Pass(), options, callback);
   }
 
   // Called by dbus:: when the Bluetooth daemon is about to disconnect the
   // profile.
   void RequestDisconnection(
       dbus::MethodCall* method_call,
       dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(OnOriginThread());
     DCHECK(delegate_);
 
@@ skipping 109 matching lines @@
         Delegate* delegate) {
   if (base::chromeos::IsRunningOnChromeOS()) {
     return new ExperimentalBluetoothProfileServiceProviderImpl(
         bus, object_path, delegate);
   } else {
     return new FakeBluetoothProfileServiceProvider(object_path, delegate);
   }
 }
 
 }  // namespace chromeos