Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

device/bluetooth/bluetooth_task_manager_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_task_manager_win.h"
 
 #include <winsock2.h>
 
 #include <string>
 
@@ skipping 193 matching lines @@
 
 void BluetoothTaskManagerWin::PollAdapter() {
   DCHECK(bluetooth_task_runner_->RunsTasksOnCurrentThread());
 
   // Skips updating the adapter info if the adapter is in discovery mode.
   if (!discovering_) {
     const BLUETOOTH_FIND_RADIO_PARAMS adapter_param =
         { sizeof(BLUETOOTH_FIND_RADIO_PARAMS) };
     if (adapter_handle_)
       adapter_handle_.Close();
-    HANDLE temp_adapter_handle;
     HBLUETOOTH_RADIO_FIND handle = BluetoothFindFirstRadio(
-        &adapter_param, &temp_adapter_handle);
+        &adapter_param, adapter_handle_.Receive());
 
     if (handle) {
-      adapter_handle_.Set(temp_adapter_handle);
       GetKnownDevices();
       BluetoothFindRadioClose(handle);
     }
     PostAdapterStateToUi();
   }
 
   // Re-poll.
   bluetooth_task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&BluetoothTaskManagerWin::PollAdapter,
@@ skipping 177 matching lines @@
         service_record_state->sdp_bytes.push_back(
             sdp_result_data->lpBlob->pBlobData[i]);
       }
       service_record_states->push_back(service_record_state);
     }
     WSALookupServiceEnd(sdp_handle);
   }
 }
 
 }  // namespace device