chrome.bluetooth API improvements.

chrome/browser/extensions/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 "chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
@@ skipping 23 matching lines @@
 }
 
 BluetoothPrivateAPI::~BluetoothPrivateAPI() {}
 
 void BluetoothPrivateAPI::Shutdown() {
   ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
       this);
 }
 
 void BluetoothPrivateAPI::OnListenerAdded(const EventListenerInfo& details) {
-  BluetoothAPI::Get(browser_context_)
-      ->bluetooth_event_router()
-      ->AddPairingDelegate(details.extension_id);
+  BluetoothAPI::Get(browser_context_)->event_router()->AddPairingDelegate(
+      details.extension_id);
 }
 
 void BluetoothPrivateAPI::OnListenerRemoved(const EventListenerInfo& details) {
-  BluetoothAPI::Get(browser_context_)
-      ->bluetooth_event_router()
-      ->RemovePairingDelegate(details.extension_id);
+  BluetoothAPI::Get(browser_context_)->event_router()->RemovePairingDelegate(
+      details.extension_id);
 }
 
 namespace api {
 
 namespace {
 
 const char kNameProperty[] = "name";
 const char kPoweredProperty[] = "powered";
 const char kDiscoverableProperty[] = "discoverable";
 
@@ skipping 152 matching lines @@
     ~BluetoothPrivateSetPairingResponseFunction() {}
 
 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())->bluetooth_event_router();
+      BluetoothAPI::Get(browser_context())->event_router();
   if (!router->GetPairingDelegate(extension_id())) {
     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);
@@ skipping 27 matching lines @@
     device->SetPasskey(*options.passkey.get());
   }
 
   SendResponse(true);
   return true;
 }
 
 }  // namespace api
 
 }  // namespace extensions