Bluetooth extension api fixes for WebUI

extensions/browser/api/bluetooth/bluetooth_private_api.cc

 // Copyright 2014 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 "extensions/browser/api/bluetooth/bluetooth_private_api.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "device/bluetooth/bluetooth_adapter.h"
@@ skipping 234 matching lines @@
 
 bool BluetoothPrivateSetPairingResponseFunction::DoWork(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   scoped_ptr<bt_private::SetPairingResponse::Params> params(
       bt_private::SetPairingResponse::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   const bt_private::SetPairingResponseOptions& options = params->options;
 
   BluetoothEventRouter* router =
       BluetoothAPI::Get(browser_context())->event_router();
-  if (!router->GetPairingDelegate(extension_id())) {
+  if (!router->GetPairingDelegate(GetExtensionId())) {
     SetError(kPairingNotEnabled);
     SendResponse(false);
     return true;
   }
 
   const std::string& device_address = options.device.address;
   device::BluetoothDevice* device = adapter->GetDevice(device_address);
   if (!device) {
     SetError(kDeviceNotFoundError);
     SendResponse(false);
@@ skipping 134 matching lines @@
       }
     }
 
     if (df_param.rssi.get())
       discovery_filter->SetRSSI(*df_param.rssi);
 
     if (df_param.pathloss.get())
       discovery_filter->SetPathloss(*df_param.pathloss);
   }
 
-  BluetoothAPI::Get(browser_context())->event_router()->SetDiscoveryFilter(
-          discovery_filter.Pass(), adapter.get(), extension_id(),
+  BluetoothAPI::Get(browser_context())
+      ->event_router()
+      ->SetDiscoveryFilter(
+          discovery_filter.Pass(), adapter.get(), GetExtensionId(),
           base::Bind(
               &BluetoothPrivateSetDiscoveryFilterFunction::OnSuccessCallback,
               this),
           base::Bind(
               &BluetoothPrivateSetDiscoveryFilterFunction::OnErrorCallback,
               this));
   return true;
 }
 
 BluetoothPrivatePairFunction::BluetoothPrivatePairFunction() {}
@@ skipping 17 matching lines @@
 
   device::BluetoothDevice* device = adapter->GetDevice(params->device_address);
   if (!device) {
     SetError(kDeviceNotFoundError);
     SendResponse(false);
     return true;
   }
 
   BluetoothEventRouter* router =
       BluetoothAPI::Get(browser_context())->event_router();
-  if (!router->GetPairingDelegate(extension_id())) {
+  if (!router->GetPairingDelegate(GetExtensionId())) {
     SetError(kPairingNotEnabled);
     SendResponse(false);
     return true;
   }
 
   device->Pair(
-      router->GetPairingDelegate(extension_id()),
+      router->GetPairingDelegate(GetExtensionId()),
       base::Bind(&BluetoothPrivatePairFunction::OnSuccessCallback, this),
       base::Bind(&BluetoothPrivatePairFunction::OnErrorCallback, this));
   return true;
 }
 
 }  // namespace api
 
 }  // namespace extensions