Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Unified Diff: base/ios/device_util_unittest.mm

Issue 11031066: Adding utility method to test the version of the OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile issue Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/ios/device_util_unittest.mm
diff --git a/base/ios/device_util_unittest.mm b/base/ios/device_util_unittest.mm
index 34c2d9c63b178d8def618f83ad27e355d6671674..311dcb953337844b8db6343cda14e76e2d91fbf7 100644
--- a/base/ios/device_util_unittest.mm
+++ b/base/ios/device_util_unittest.mm
@@ -5,6 +5,7 @@
#import <Foundation/Foundation.h>
#include "base/ios/device_util.h"
+#include "base/sys_info.h"
#include "base/sys_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
@@ -47,7 +48,10 @@ TEST_F(DeviceUtilTest, GetDeviceIdentifier) {
[defaults synchronize];
std::string new_default_id = ios::device_util::GetDeviceIdentifier(NULL);
- EXPECT_NE(default_id, new_default_id);
+ if (base::SysInfo::IsRunningOnIOS6OrLater())
+ EXPECT_EQ(default_id, new_default_id);
+ else
+ EXPECT_NE(default_id, new_default_id);
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698