Cleanup: Drop some unnecessary params from the BluetoothSocketNet constructor.

device/bluetooth/bluetooth_socket_chromeos.cc

 // Copyright 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 "device/bluetooth/bluetooth_socket_chromeos.h"
 
 #include <queue>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 38 matching lines @@
 const char kSocketNotListening[] = "Socket is not listening.";
 
 }  // namespace
 
 namespace chromeos {
 
 // static
 scoped_refptr<BluetoothSocketChromeOS>
 BluetoothSocketChromeOS::CreateBluetoothSocket(
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
-    scoped_refptr<BluetoothSocketThread> socket_thread,
-    net::NetLog* net_log,
-    const net::NetLog::Source& source) {
+    scoped_refptr<BluetoothSocketThread> socket_thread) {
   DCHECK(ui_task_runner->RunsTasksOnCurrentThread());
 
   return make_scoped_refptr(
-      new BluetoothSocketChromeOS(
-          ui_task_runner, socket_thread, net_log, source));
+      new BluetoothSocketChromeOS(ui_task_runner, socket_thread));

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

ui_task_runner and socket_thread are singletons too, no?

 }
 
 BluetoothSocketChromeOS::AcceptRequest::AcceptRequest() {}
 
 BluetoothSocketChromeOS::AcceptRequest::~AcceptRequest() {}
 
 BluetoothSocketChromeOS::ConnectionRequest::ConnectionRequest()
     : accepting(false),
       cancelled(false) {}
 
 BluetoothSocketChromeOS::ConnectionRequest::~ConnectionRequest() {}
 
 BluetoothSocketChromeOS::BluetoothSocketChromeOS(
     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) {
 }
 
 BluetoothSocketChromeOS::~BluetoothSocketChromeOS() {
   DCHECK(object_path_.value().empty());
   DCHECK(profile_.get() == NULL);
 
   if (adapter_.get()) {
     adapter_->RemoveObserver(this);
     adapter_ = NULL;
   }
@@ skipping 336 matching lines @@
   linked_ptr<ConnectionRequest> request = connection_request_queue_.front();
   request->accepting = true;
 
   BluetoothDeviceChromeOS* device =
       static_cast<BluetoothAdapterChromeOS*>(adapter_.get())->
           GetDeviceWithPath(request->device_path);
   DCHECK(device);
 
   scoped_refptr<BluetoothSocketChromeOS> client_socket =
       BluetoothSocketChromeOS::CreateBluetoothSocket(
-          ui_task_runner(),
-          socket_thread(),
-          net_log(),
-          source());
+          ui_task_runner(), socket_thread());
 
   client_socket->device_address_ = device->GetAddress();
   client_socket->device_path_ = request->device_path;
   client_socket->uuid_ = uuid_;
 
   socket_thread()->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(
           &BluetoothSocketChromeOS::DoNewConnection,
           client_socket,
@@ skipping 125 matching lines @@
   // It's okay if the profile doesn't exist, it means we haven't registered it
   // yet.
   if (error_name == bluetooth_profile_manager::kErrorDoesNotExist)
     return;
 
   LOG(WARNING) << object_path_.value() << ": Failed to unregister profile: "
                << error_name << ": " << error_message;
 }
 
 }  // namespace chromeos