Index: webkit/common/user_agent/user_agent_util_ios.mm |
diff --git a/webkit/common/user_agent/user_agent_util_ios.mm b/webkit/common/user_agent/user_agent_util_ios.mm |
index 3c80babc8a9cbde6c07917411dbb60e2d83fd0be..a5f27061ab09b705a5b4b4a49b1c22f0856b121a 100644 |
--- a/webkit/common/user_agent/user_agent_util_ios.mm |
+++ b/webkit/common/user_agent/user_agent_util_ios.mm |
@@ -9,7 +9,7 @@ |
#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" |
@@ -110,7 +110,7 @@ std::string BuildOSCpuInfo() { |
// 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", |