Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.

content/browser/geolocation/wifi_data_provider_linux.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.
 
 // Provides wifi scan API binding for suitable for typical linux distributions.
 // Currently, only the NetworkManager API is used, accessed via D-Bus (in turn
 // accessed via the GLib wrapper).
 
 #include "content/browser/geolocation/wifi_data_provider_linux.h"
 
@@ skipping 130 matching lines @@
                                     device_path);
 
     dbus::MethodCall method_call(DBUS_INTERFACE_PROPERTIES, "Get");
     dbus::MessageWriter builder(&method_call);
     builder.AppendString("org.freedesktop.NetworkManager.Device");
     builder.AppendString("DeviceType");
     scoped_ptr<dbus::Response> response(
         device_proxy->CallMethodAndBlock(
             &method_call,
             dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
-    if (!response.get()) {
+    if (!response) {
       LOG(WARNING) << "Failed to get the device type for "
                    << device_path.value();
       continue;  // Check the next device.
     }
     dbus::MessageReader reader(response.get());
     uint32 device_type = 0;
     if (!reader.PopVariantOfUint32(&device_type)) {
       LOG(WARNING) << "Unexpected response for " << device_type << ": "
                    << response->ToString();
       continue;  // Check the next device.
@@ skipping 11 matching lines @@
   return success_count || fail_count == 0;
 }
 
 bool NetworkManagerWlanApi::GetAdapterDeviceList(
     std::vector<dbus::ObjectPath>* device_paths) {
   dbus::MethodCall method_call(kNetworkManagerInterface, "GetDevices");
   scoped_ptr<dbus::Response> response(
       network_manager_proxy_->CallMethodAndBlock(
           &method_call,
           dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
-  if (!response.get()) {
+  if (!response) {
     LOG(WARNING) << "Failed to get the device list";
     return false;
   }
 
   dbus::MessageReader reader(response.get());
   if (!reader.PopArrayOfObjectPaths(device_paths)) {
     LOG(WARNING) << "Unexpected response: " << response->ToString();
     return false;
   }
   return true;
 }
 
 
 bool NetworkManagerWlanApi::GetAccessPointsForAdapter(
     const dbus::ObjectPath& adapter_path, WifiData::AccessPointDataSet* data) {
   // Create a proxy object for this wifi adapter, and ask it to do a scan
   // (or at least, dump its scan results).
   dbus::ObjectProxy* device_proxy =
       system_bus_->GetObjectProxy(kNetworkManagerServiceName,
                                   adapter_path);
   dbus::MethodCall method_call(
       "org.freedesktop.NetworkManager.Device.Wireless",
       "GetAccessPoints");
   scoped_ptr<dbus::Response> response(
       device_proxy->CallMethodAndBlock(
           &method_call,
           dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
-  if (!response.get()) {
+  if (!response) {
     LOG(WARNING) << "Failed to get access points data for "
                  << adapter_path.value();
     return false;
   }
   dbus::MessageReader reader(response.get());
   std::vector<dbus::ObjectPath> access_point_paths;
   if (!reader.PopArrayOfObjectPaths(&access_point_paths)) {
     LOG(WARNING) << "Unexpected response for " << adapter_path.value() << ": "
                  << response->ToString();
     return false;
   }
 
   VLOG(1) << "Wireless adapter " << adapter_path.value() << " found "
           << access_point_paths.size() << " access points.";
 
   for (size_t i = 0; i < access_point_paths.size(); ++i) {
     const dbus::ObjectPath& access_point_path = access_point_paths[i];
     VLOG(1) << "Checking access point: " << access_point_path.value();
 
     dbus::ObjectProxy* access_point_proxy =
         system_bus_->GetObjectProxy(kNetworkManagerServiceName,
                                     access_point_path);
 
     AccessPointData access_point_data;
     {
       scoped_ptr<dbus::Response> response(
           GetAccessPointProperty(access_point_proxy, "Ssid"));
-      if (!response.get())
+      if (!response)
         continue;
       // The response should contain a variant that contains an array of bytes.
       dbus::MessageReader reader(response.get());
       dbus::MessageReader variant_reader(response.get());
       if (!reader.PopVariant(&variant_reader)) {
         LOG(WARNING) << "Unexpected response for " << access_point_path.value()
                      << ": " << response->ToString();
         continue;
       }
       uint8* ssid_bytes = NULL;
       size_t ssid_length = 0;
       if (!variant_reader.PopArrayOfBytes(&ssid_bytes, &ssid_length)) {
         LOG(WARNING) << "Unexpected response for " << access_point_path.value()
                      << ": " << response->ToString();
         continue;
       }
       std::string ssid(ssid_bytes, ssid_bytes + ssid_length);
       access_point_data.ssid = UTF8ToUTF16(ssid);
     }
 
     { // Read the mac address
       scoped_ptr<dbus::Response> response(
           GetAccessPointProperty(access_point_proxy, "HwAddress"));
-      if (!response.get())
+      if (!response)
         continue;
       dbus::MessageReader reader(response.get());
       std::string mac;
       if (!reader.PopVariantOfString(&mac)) {
         LOG(WARNING) << "Unexpected response for " << access_point_path.value()
                      << ": " << response->ToString();
         continue;
       }
 
       ReplaceSubstringsAfterOffset(&mac, 0U, ":", std::string());
       std::vector<uint8> mac_bytes;
       if (!base::HexStringToBytes(mac, &mac_bytes) || mac_bytes.size() != 6) {
         LOG(WARNING) << "Can't parse mac address (found " << mac_bytes.size()
                      << " bytes) so using raw string: " << mac;
         access_point_data.mac_address = UTF8ToUTF16(mac);
       } else {
         access_point_data.mac_address = MacAddressAsString16(&mac_bytes[0]);
       }
     }
 
     {  // Read signal strength.
       scoped_ptr<dbus::Response> response(
           GetAccessPointProperty(access_point_proxy, "Strength"));
-      if (!response.get())
+      if (!response)
         continue;
       dbus::MessageReader reader(response.get());
       uint8 strength = 0;
       if (!reader.PopVariantOfByte(&strength)) {
         LOG(WARNING) << "Unexpected response for " << access_point_path.value()
                      << ": " << response->ToString();
         continue;
       }
       // Convert strength as a percentage into dBs.
       access_point_data.radio_signal_strength = -100 + strength / 2;
     }
 
     { // Read the channel
       scoped_ptr<dbus::Response> response(
           GetAccessPointProperty(access_point_proxy, "Frequency"));
-      if (!response.get())
+      if (!response)
         continue;
       dbus::MessageReader reader(response.get());
       uint32 frequency = 0;
       if (!reader.PopVariantOfUint32(&frequency)) {
         LOG(WARNING) << "Unexpected response for " << access_point_path.value()
                      << ": " << response->ToString();
         continue;
       }
 
       // NetworkManager returns frequency in MHz.
@@ skipping 14 matching lines @@
 scoped_ptr<dbus::Response> NetworkManagerWlanApi::GetAccessPointProperty(
     dbus::ObjectProxy* access_point_proxy,
     const std::string& property_name) {
   dbus::MethodCall method_call(DBUS_INTERFACE_PROPERTIES, "Get");
   dbus::MessageWriter builder(&method_call);
   builder.AppendString("org.freedesktop.NetworkManager.AccessPoint");
   builder.AppendString(property_name);
   scoped_ptr<dbus::Response> response = access_point_proxy->CallMethodAndBlock(
       &method_call,
       dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
-  if (!response.get()) {
+  if (!response) {
     LOG(WARNING) << "Failed to get property for " << property_name;
   }
   return response.Pass();
 }
 
 }  // namespace
 
 // static
 template<>
 WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
@@ skipping 23 matching lines @@
 
 WifiDataProviderCommon::WlanApiInterface*
 WifiDataProviderLinux::NewWlanApiForTesting(dbus::Bus* bus) {
   scoped_ptr<NetworkManagerWlanApi> wlan_api(new NetworkManagerWlanApi);
   if (wlan_api->InitWithBus(bus))
     return wlan_api.release();
   return NULL;
 }
 
 }  // namespace content