Cleanup: Drop some unnecessary params from the BluetoothSocketNet constructor.

device/bluetooth/bluetooth_socket_win.cc

 // Copyright (c) 2012 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/bluetooth_socket_win.h"
 
 #include <objbase.h>
 
 #include <string>
 
@@ skipping 57 matching lines @@
   CSADDR_INFO address_info;
   GUID uuid;
   base::string16 name;
   WSAQUERYSET service;
 };
 
 // static
 scoped_refptr<BluetoothSocketWin>
 BluetoothSocketWin::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) {
   DCHECK(ui_task_runner->RunsTasksOnCurrentThread());
 
   return make_scoped_refptr(
-      new BluetoothSocketWin(ui_task_runner, socket_thread, net_log, source));
+      new BluetoothSocketWin(ui_task_runner, socket_thread));

[keybuk, 2014/07/17 18:35:09]

these are both singletons too, they're passed down from the adapter right now -
but is there any reason that must be the case?

(since we're not passing net::NetLog and net::NetLog::Source down now)

[Ilya Sherman, 2014/07/17 18:41:09]

I think it's a little different -- the other params were not singletons, but
rather just null/default values.  These two are singletons, but they're passed
from the adapter into other classes as well.  Since they're shared among
multiple classes, I think it makes sense for the adapter to keep the master
references, and pass them into the classes it manages, rather than having each
of those classes access the singleton directly.  That way, there's only one
place to update if we ever want to change e.g. how we choose the socket thread.

 }
 
 BluetoothSocketWin::BluetoothSocketWin(
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
-    scoped_refptr<BluetoothSocketThread> socket_thread,
-    net::NetLog* net_log,
-    const net::NetLog::Source& source)
-    : BluetoothSocketNet(ui_task_runner, socket_thread, net_log, source),
+    scoped_refptr<BluetoothSocketThread> socket_thread)
+    : BluetoothSocketNet(ui_task_runner, socket_thread),
       supports_rfcomm_(false),
       rfcomm_channel_(-1),
       bth_addr_(BTH_ADDR_NULL) {
 }
 
 BluetoothSocketWin::~BluetoothSocketWin() {
 }
 
 void BluetoothSocketWin::Connect(
     const BluetoothDeviceWin* device,
@@ skipping 279 matching lines @@
   const std::string peer_device_address =
       IPEndPointToBluetoothAddress(peer_address);
   const BluetoothDevice* peer_device = adapter_->GetDevice(peer_device_address);
   if (!peer_device) {
     LOG(WARNING) << "OnAccept failed with unknown device, addr="
                  << peer_device_address;
     error_callback.Run(kFailedToAccept);
     return;
   }
 
-  scoped_refptr<BluetoothSocketWin> peer_socket = CreateBluetoothSocket(
-          ui_task_runner(),
-          socket_thread(),
-          net_log(),
-          source());
+  scoped_refptr<BluetoothSocketWin> peer_socket =
+      CreateBluetoothSocket(ui_task_runner(), socket_thread());
   peer_socket->SetTCPSocket(accept_socket.Pass());
   success_callback.Run(peer_device, peer_socket);
 }
 
 }  // namespace device