bluetooth: Move FactoryWrapper to device and expose a function for testing in chooser controller

content/browser/bluetooth/bluetooth_device_chooser_controller.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DEVICE_CHOOSER_CONTROLLER_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DEVICE_CHOOSER_CONTROLLER_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 23 matching lines @@
   typedef base::Callback<void(blink::mojom::WebBluetoothRequestDeviceOptionsPtr,
                               const std::string& device_address)>
       SuccessCallback;
   typedef base::Callback<void(blink::mojom::WebBluetoothError error)>
       ErrorCallback;
 
   // |web_bluetooth_service_| service that owns this class.
   // |render_frame_host| should be the RenderFrameHost that owns the
   // |web_bluetooth_service_|.
   // |adapter| should be the adapter used to scan for Bluetooth devices.
   // |scan_duration| is how long will a discovery session be active.

[scheib, 2016/06/22 03:44:22]

Remove comment for scan duration.

[ortuno, 2016/06/23 21:54:59]

Done.

   BluetoothDeviceChooserController(
       WebBluetoothServiceImpl* web_bluetooth_service_,
       RenderFrameHost* render_frame_host,
-      device::BluetoothAdapter* adapter,
-      base::TimeDelta scan_duration);
+      device::BluetoothAdapter* adapter);
   ~BluetoothDeviceChooserController();
 
   // This function performs the following checks before starting a discovery
   // session:
   //   - Validates filters in |request_device_options|.
   //   - Removes any blacklisted UUIDs from
   //     |request_device_options.optinal_services|.
   //   - Checks if the request came from a cross-origin iframe.
   //   - Checks if the request came from a unique origin.
   //   - Checks if the adapter is present.
@@ skipping 79 matching lines @@
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothDeviceChooserController> weak_ptr_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DEVICE_CHOOSER_CONTROLLER_H_