Revert 156348 (caused http://crbug.com/149828)

chrome/browser/chromeos/extensions/bluetooth_event_router.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 "chrome/browser/chromeos/extensions/bluetooth_event_router.h"
 
 #include <map>
 
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
@@ skipping 63 matching lines @@
 bool ExtensionBluetoothEventRouter::IsResponsibleForDiscovery() const {
   return responsible_for_discovery_;
 }
 
 void ExtensionBluetoothEventRouter::SetSendDiscoveryEvents(bool should_send) {
   // At the transition into sending devices, also send past devices that
   // were discovered as they will not be discovered again.
   if (should_send && !send_discovery_events_) {
     for (DeviceList::const_iterator i = discovered_devices_.begin();
         i != discovered_devices_.end(); ++i) {
-      DispatchDeviceEvent(extensions::event_names::kBluetoothOnDeviceDiscovered,
-                          **i);
+      DispatchDeviceEvent(**i);
     }
   }
 
   send_discovery_events_ = should_send;
 }
 
-void ExtensionBluetoothEventRouter::DispatchDeviceEvent(
-    const char* event_name, const experimental_bluetooth::Device& device) {
-  scoped_ptr<ListValue> args(new ListValue());
-  args->Append(device.ToValue().release());
-  profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
-      event_name,
-      args.Pass(),
-      NULL,
-      GURL());
-}
-
 void ExtensionBluetoothEventRouter::AdapterPresentChanged(
     chromeos::BluetoothAdapter* adapter, bool present) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
   }
 
   DispatchBooleanValueEvent(
       extensions::event_names::kBluetoothOnAvailabilityChanged,
       present);
@@ skipping 30 matching lines @@
 }
 
 void ExtensionBluetoothEventRouter::DeviceAdded(
     chromeos::BluetoothAdapter* adapter, chromeos::BluetoothDevice* device) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
   }
 
   experimental_bluetooth::Device* extension_device =
-      new experimental_bluetooth::Device();
+    new experimental_bluetooth::Device();
   experimental_bluetooth::BluetoothDeviceToApiDevice(*device, extension_device);
   discovered_devices_.push_back(extension_device);
 
   if (!send_discovery_events_)
     return;
 
-  DispatchDeviceEvent(extensions::event_names::kBluetoothOnDeviceDiscovered,
-                      *extension_device);
+  DispatchDeviceEvent(*extension_device);
 }
 
 void ExtensionBluetoothEventRouter::DispatchBooleanValueEvent(
     const char* event_name, bool value) {
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(Value::CreateBooleanValue(value));
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name, args.Pass(), NULL, GURL());
 }
 
+void ExtensionBluetoothEventRouter::DispatchDeviceEvent(
+    const experimental_bluetooth::Device& device) {
+  scoped_ptr<ListValue> args(new ListValue());
+  args->Append(device.ToValue().release());
+  profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
+      extensions::event_names::kBluetoothOnDeviceDiscovered,
+      args.Pass(),
+      NULL,
+      GURL());
+}
+
 }  // namespace chromeos