mac: Update clients of scoped_nsobject.h.

content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm

 // 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 "content/browser/gamepad/gamepad_platform_data_fetcher_mac.h"
 
 #include "base/mac/foundation_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 
+#import <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDKeys.h>
-#import <Foundation/Foundation.h>
 
 using WebKit::WebGamepad;
 using WebKit::WebGamepads;
 
 namespace content {
 
 namespace {
 
 NSDictionary* DeviceMatching(uint32_t usage_page, uint32_t usage) {
   return [NSDictionary dictionaryWithObjectsAndKeys:
@@ skipping 27 matching lines @@
   if (!xbox_fetcher_->RegisterForNotifications())
     xbox_fetcher_.reset();
 
   hid_manager_ref_.reset(IOHIDManagerCreate(kCFAllocatorDefault,
                                             kIOHIDOptionsTypeNone));
   if (CFGetTypeID(hid_manager_ref_) != IOHIDManagerGetTypeID()) {
     enabled_ = false;
     return;
   }
 
-  scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
+  base::scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
       DeviceMatching(kGenericDesktopUsagePage, kJoystickUsageNumber),
       DeviceMatching(kGenericDesktopUsagePage, kGameUsageNumber),
       DeviceMatching(kGenericDesktopUsagePage, kMultiAxisUsageNumber),
       nil]);

[Nico, 2013/06/25 01:09:50]

This is maybe partially PR16185.

   IOHIDManagerSetDeviceMatchingMultiple(
       hid_manager_ref_,
       base::mac::NSToCFCast(criteria));
 
   RegisterForNotifications();
 }
 
 void GamepadPlatformDataFetcherMac::RegisterForNotifications() {
   // Register for plug/unplug notifications.
   IOHIDManagerRegisterDeviceMatchingCallback(
@@ skipping 354 matching lines @@
   pads->length = WebGamepads::itemsLengthCap;
   for (size_t i = 0; i < WebGamepads::itemsLengthCap; ++i) {
     if (!associated_[i].is_xbox && associated_[i].hid.mapper)
       associated_[i].hid.mapper(data_.items[i], &pads->items[i]);
     else
       pads->items[i] = data_.items[i];
   }
 }
 
 }  // namespace content