Geolocation cleanup: use unique_ptr<>s and rename New{WlanApi/PollingPolicy} to CreateBla()

device/geolocation/wifi_data_provider_common.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/geolocation/wifi_data_provider_common.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
@@ skipping 10 matching lines @@
       mac_as_int[3], mac_as_int[4], mac_as_int[5]));
 }
 
 WifiDataProviderCommon::WifiDataProviderCommon()
     : is_first_scan_complete_(false), weak_factory_(this) {}
 
 WifiDataProviderCommon::~WifiDataProviderCommon() {}
 
 void WifiDataProviderCommon::StartDataProvider() {
   DCHECK(!wlan_api_);
-  wlan_api_.reset(NewWlanApi());
+  wlan_api_ = CreateWlanApi();
   if (!wlan_api_) {
     // Error! Can't do scans, so don't try and schedule one.
     is_first_scan_complete_ = true;
     return;
   }
 
   DCHECK(!polling_policy_);
-  polling_policy_.reset(NewPollingPolicy());
+  polling_policy_ = CreatePollingPolicy();
   DCHECK(polling_policy_);
 
   // Perform first scan ASAP regardless of the polling policy. If this scan
   // fails we'll retry at a rate in line with the polling policy.
   ScheduleNextScan(0);
 }
 
 void WifiDataProviderCommon::StopDataProvider() {
   wlan_api_.reset();
   polling_policy_.reset();
@@ skipping 24 matching lines @@
 }
 
 void WifiDataProviderCommon::ScheduleNextScan(int interval) {
   client_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&WifiDataProviderCommon::DoWifiScanTask,
                             weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(interval));
 }
 
 }  // namespace device