Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / device / bluetooth / bluetooth_socket_chromeos.h

diff --git a/src/device/bluetooth/bluetooth_socket_chromeos.h b/src/device/bluetooth/bluetooth_socket_chromeos.h
index 43f5126..949abf6 100644 (file)
--- a/src/device/bluetooth/bluetooth_socket_chromeos.h
+++ b/src/device/bluetooth/bluetooth_socket_chromeos.h
@@ -36,9 +36,7 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS
  public:
   static scoped_refptr<BluetoothSocketChromeOS> CreateBluetoothSocket(
       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
-      scoped_refptr<device::BluetoothSocketThread> socket_thread,
-      net::NetLog* net_log,
-      const net::NetLog::Source& source);
+      scoped_refptr<device::BluetoothSocketThread> socket_thread);
 
   // Connects this socket to the service on |device| published as UUID |uuid|,
   // the underlying protocol and PSM or Channel is obtained through service
@@ -52,17 +50,18 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS
 
   // Listens using this socket using a service published on |adapter|. The
   // service is either RFCOMM or L2CAP depending on |socket_type| and published
-  // as UUID |uuid|. The |psm_or_channel| argument is interpreted according to
+  // as UUID |uuid|. The |service_options| argument is interpreted according to
   // |socket_type|. |success_callback| will be called if the service is
   // successfully registered, |error_callback| on failure with a message
   // explaining the cause.
   enum SocketType { kRfcomm, kL2cap };
-  virtual void Listen(scoped_refptr<device::BluetoothAdapter> adapter,
-                      SocketType socket_type,
-                      const device::BluetoothUUID& uuid,
-                      int psm_or_channel,
-                      const base::Closure& success_callback,
-                      const ErrorCompletionCallback& error_callback);
+  virtual void Listen(
+      scoped_refptr<device::BluetoothAdapter> adapter,
+      SocketType socket_type,
+      const device::BluetoothUUID& uuid,
+      const device::BluetoothAdapter::ServiceOptions& service_options,
+      const base::Closure& success_callback,
+      const ErrorCompletionCallback& error_callback);
 
   // BluetoothSocket:
   virtual void Close() OVERRIDE;
@@ -79,9 +78,7 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS
  private:
   BluetoothSocketChromeOS(
       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
-      scoped_refptr<device::BluetoothSocketThread> socket_thread,
-      net::NetLog* net_log,
-      const net::NetLog::Source& source);
+      scoped_refptr<device::BluetoothSocketThread> socket_thread);
 
   // Register the underlying profile client object with the Bluetooth Daemon.
   void RegisterProfile(const base::Closure& success_callback,