mac: Update clients of scoped_nsobject.h.

webkit/common/user_agent/user_agent_util_ios.mm

 // Copyright 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 "webkit/common/user_agent/user_agent_util.h"
 
 #import <UIKit/UIKit.h>
 
 #include <sys/sysctl.h>
 #include <string>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/sys_info.h"
 
 namespace {
 
 struct UAVersions {
   const char* safari_version_string;
   const char* webkit_version_string;
@@ skipping 80 matching lines @@
   // Up until iOS 5, the locale was included at the end of the Safari UA.
   // TODO(stuartmorgan): Remove this once iOS 4.3 is no longer supported.
   if (os_major_version < 5) {
     // The locale string is not easy to set correctly. Safari uses a language
     // code and a dialect code. However, there is no setting allowing the user
     // to set the dialect code, and no API to retrieve it.
     // Note: The NSLocale methods (currentIdentifier:,
     // objectForKey:NSLocaleLanguageCode and objectForKey:NSLocaleCountryCode)
     // are not useful here because they return information related to the
     // "Region Format" setting, which is different from the "Language" setting.
-    scoped_nsobject<NSDictionary> dialects([[NSDictionary alloc]
+    base::scoped_nsobject<NSDictionary> dialects([[NSDictionary alloc]
         initWithObjectsAndKeys:

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

Also PR16435 and PR16436

             @"ar",    @"ar",  // No dialect code in Safari.
             @"ca-es", @"ca",
             @"cs-cz", @"cs",
             @"da-dk", @"da",
             @"el-gr", @"el",
             @"en-gb", @"en-GB",
             @"en-us", @"en",
             @"he-il", @"he",
             @"id",    @"id",  // No dialect code in Safari.
             @"ja-jp", @"ja",
@@ skipping 45 matching lines @@
       webkit_glue::BuildOSCpuInfo().c_str(),
       ua_versions.webkit_version_string,
       product.c_str(),
       kernel_version,
       ua_versions.safari_version_string);
 
   return user_agent;
 }
 
 }  // namespace webkit_glue