Cleanup: Correctly spell success(ful).

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

 // Copyright 2015 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 "content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/format_macros.h"
 #include "base/location.h"
@@ skipping 91 matching lines @@
       return device;
   }
   return NULL;
 }
 
 std::set<BluetoothUUID> GetUUIDs(
     const device::BluetoothDiscoveryFilter* filter) {
   std::set<BluetoothUUID> result;
   filter->GetUUIDs(result);
   return result;
-};
+}
 
 // Notifies the adapter's observers that the services have been discovered.
 void NotifyServicesDiscovered(MockBluetoothAdapter* adapter,
                               MockBluetoothDevice* device) {
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, adapter->GetObservers(),
                     GattServicesDiscovered(adapter, device));
 }
 
 }  // namespace
 
 namespace content {
 
 // static
 scoped_refptr<BluetoothAdapter>
 LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter(
     const std::string& fake_adapter_name) {
   if (fake_adapter_name == "BaseAdapter")
     return GetBaseAdapter();
-  else if (fake_adapter_name == "NotPresentAdapter")
+  if (fake_adapter_name == "NotPresentAdapter")
     return GetNotPresentAdapter();
-  else if (fake_adapter_name == "NotPoweredAdapter")
+  if (fake_adapter_name == "NotPoweredAdapter")
     return GetNotPoweredAdapter();
-  else if (fake_adapter_name == "ScanFilterCheckingAdapter")
+  if (fake_adapter_name == "ScanFilterCheckingAdapter")
     return GetScanFilterCheckingAdapter();
-  else if (fake_adapter_name == "EmptyAdapter")
+  if (fake_adapter_name == "EmptyAdapter")
     return GetEmptyAdapter();
-  else if (fake_adapter_name == "FailStartDiscoveryAdapter")
+  if (fake_adapter_name == "FailStartDiscoveryAdapter")
     return GetFailStartDiscoveryAdapter();
-  else if (fake_adapter_name == "GlucoseHeartRateAdapter")
+  if (fake_adapter_name == "GlucoseHeartRateAdapter")
     return GetGlucoseHeartRateAdapter();
-  else if (fake_adapter_name == "UnicodeDeviceAdapter")
+  if (fake_adapter_name == "UnicodeDeviceAdapter")
     return GetUnicodeDeviceAdapter();
-  else if (fake_adapter_name == "MissingServiceHeartRateAdapter")
+  if (fake_adapter_name == "MissingServiceHeartRateAdapter")
     return GetMissingServiceHeartRateAdapter();
-  else if (fake_adapter_name == "MissingCharacteristicHeartRateAdapter")
+  if (fake_adapter_name == "MissingCharacteristicHeartRateAdapter")
     return GetMissingCharacteristicHeartRateAdapter();
-  else if (fake_adapter_name == "HeartRateAdapter")
+  if (fake_adapter_name == "HeartRateAdapter")
     return GetHeartRateAdapter();
-  else if (fake_adapter_name == "FailingConnectionsAdapter")
+  if (fake_adapter_name == "FailingConnectionsAdapter")
     return GetFailingConnectionsAdapter();
-  else if (fake_adapter_name == "FailingGATTOperationsAdapter")
+  if (fake_adapter_name == "FailingGATTOperationsAdapter")
     return GetFailingGATTOperationsAdapter();
-  else if (fake_adapter_name == "SecondDiscoveryFindsHeartRateAdapter")
+  if (fake_adapter_name == "SecondDiscoveryFindsHeartRateAdapter")
     return GetSecondDiscoveryFindsHeartRateAdapter();
-  else if (fake_adapter_name == "DelayedServicesDiscoveryAdapter")
+  if (fake_adapter_name == "DelayedServicesDiscoveryAdapter")
     return GetDelayedServicesDiscoveryAdapter();
-  else if (fake_adapter_name == "")
+  if (fake_adapter_name.empty())
     return nullptr;
 
   if (base::StartsWith(fake_adapter_name, "PowerValueAdapter",
                        base::CompareCase::SENSITIVE)) {
     std::vector<StringPiece> args =
         base::SplitStringPiece(fake_adapter_name, ":", base::KEEP_WHITESPACE,
                                base::SPLIT_WANT_NONEMPTY);
     DCHECK(args[0] == "PowerValueAdapter");
     DCHECK(args.size() == 3) << "Should contain AdapterName:TxPower:RSSI";
 
@@ skipping 17 matching lines @@
     DCHECK(args.size() == 3)
         << "Should contain AdapterName:TxPowerPresent:RSSIPResent";
     DCHECK(args[1] == "true" || args[1] == "false");
     DCHECK(args[2] == "true" || args[2] == "false");
 
     return GetPowerPresenceAdapter(args[1] == "true" /* tx_power_present */,
                                    args[2] == "true" /* rssi_present */);
   }
 
   NOTREACHED() << fake_adapter_name;
-  return NULL;
+  return nullptr;
 }
 
 // Adapters
 
 // static
 scoped_refptr<NiceMockBluetoothAdapter>
 LayoutTestBluetoothAdapterProvider::GetBaseAdapter() {
   scoped_refptr<NiceMockBluetoothAdapter> adapter(
       new NiceMockBluetoothAdapter());
 
@@ skipping 482 matching lines @@
   // Read response.
   std::string device_name_str = device->GetDeviceName();
   std::vector<uint8_t> device_name_value(device_name_str.begin(),
                                          device_name_str.end());
 
   ON_CALL(*device_name, ReadRemoteCharacteristic(_, _))
       .WillByDefault(RunCallback<0>(device_name_value));
 
   // Write response.
   ON_CALL(*device_name, WriteRemoteCharacteristic(_, _, _))
-      .WillByDefault(RunCallback<1 /* sucess callback */>());
+      .WillByDefault(RunCallback<1 /* success callback */>());
 
   generic_access->AddMockCharacteristic(device_name.Pass());
 
   return generic_access;
 }
 
 // static
 scoped_ptr<NiceMockBluetoothGattService>
 LayoutTestBluetoothAdapterProvider::GetHeartRateService(
     MockBluetoothAdapter* adapter,
@@ skipping 118 matching lines @@
   return base::StringPrintf("%08x-97e5-4cd7-b9f1-f5a427670c59", alias);
 }
 
 // static
 std::string LayoutTestBluetoothAdapterProvider::makeMACAddress(uint64_t addr) {
   return BluetoothDevice::CanonicalizeAddress(
       base::StringPrintf("%012" PRIx64, addr));
 }
 
 }  // namespace content