From d01f31157323886cac62425781056ae7bf6c09ba Mon Sep 17 00:00:00 2001 From: "stuartmorgan@chromium.org" Date: Thu, 19 Jun 2014 22:49:55 +0000 Subject: Remove IsRunningOnIOS6OrLater iOS 5 hasn't been supported for several releases, so this is always true. BUG=300130 Review URL: https://codereview.chromium.org/349453002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278519 0039d316-1c4b-4281-b951-d872f2087c98 --- base/ios/device_util.mm | 8 ++------ base/ios/device_util_unittest.mm | 3 +-- base/ios/ios_util.h | 3 --- base/ios/ios_util.mm | 4 ---- 4 files changed, 3 insertions(+), 15 deletions(-) (limited to 'base/ios') diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm index c345e5e..ff7be36 100644 --- a/base/ios/device_util.mm +++ b/base/ios/device_util.mm @@ -44,13 +44,9 @@ NSString* GenerateClientId() { // http://openradar.appspot.com/12377282. If this is the case, revert to // generating a new one. if (!client_id || [client_id isEqualToString:kZeroUUID]) { - if (base::ios::IsRunningOnIOS6OrLater()) { - client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString]; - if ([client_id isEqualToString:kZeroUUID]) - client_id = base::SysUTF8ToNSString(ios::device_util::GetRandomId()); - } else { + client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString]; + if ([client_id isEqualToString:kZeroUUID]) client_id = base::SysUTF8ToNSString(ios::device_util::GetRandomId()); - } } return client_id; } diff --git a/base/ios/device_util_unittest.mm b/base/ios/device_util_unittest.mm index 688acc1..3494e00 100644 --- a/base/ios/device_util_unittest.mm +++ b/base/ios/device_util_unittest.mm @@ -52,8 +52,7 @@ TEST_F(DeviceUtilTest, GetDeviceIdentifier) { CleanNSUserDefaultsForDeviceId(); std::string new_default_id = ios::device_util::GetDeviceIdentifier(NULL); - if (base::ios::IsRunningOnIOS6OrLater() && - ![[[[UIDevice currentDevice] identifierForVendor] UUIDString] + if (![[[[UIDevice currentDevice] identifierForVendor] UUIDString] isEqualToString:@"00000000-0000-0000-0000-000000000000"]) { EXPECT_EQ(default_id, new_default_id); } else { diff --git a/base/ios/ios_util.h b/base/ios/ios_util.h index 7e2e621..f9ddb26 100644 --- a/base/ios/ios_util.h +++ b/base/ios/ios_util.h @@ -11,9 +11,6 @@ namespace base { namespace ios { -// Returns whether the operating system is iOS 6 or later. -BASE_EXPORT bool IsRunningOnIOS6OrLater(); - // Returns whether the operating system is iOS 7 or later. BASE_EXPORT bool IsRunningOnIOS7OrLater(); diff --git a/base/ios/ios_util.mm b/base/ios/ios_util.mm index a76911017f..0f106de 100644 --- a/base/ios/ios_util.mm +++ b/base/ios/ios_util.mm @@ -20,10 +20,6 @@ const int32* OSVersionAsArray() { namespace base { namespace ios { -bool IsRunningOnIOS6OrLater() { - return IsRunningOnOrLater(6, 0, 0); -} - bool IsRunningOnIOS7OrLater() { return IsRunningOnOrLater(7, 0, 0); } -- cgit v1.1