summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorstuartmorgan <stuartmorgan@chromium.org>2014-12-08 06:35:07 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-08 14:35:29 +0000
commit9cf258907a830d80b99b4bdd0876180d8ee831c2 (patch)
tree9ddf91e11f6d85d2dd12caf45bc8a9f5403b8228 /components
parent58e962eba0bebad956b8e1023940460fab39b392 (diff)
downloadchromium_src-9cf258907a830d80b99b4bdd0876180d8ee831c2.zip
chromium_src-9cf258907a830d80b99b4bdd0876180d8ee831c2.tar.gz
chromium_src-9cf258907a830d80b99b4bdd0876180d8ee831c2.tar.bz2
Remove obsolete iOS version checks
BUG=402922 Review URL: https://codereview.chromium.org/750193003 Cr-Commit-Position: refs/heads/master@{#307244}
Diffstat (limited to 'components')
-rw-r--r--components/policy/core/common/policy_loader_ios_unittest.mm14
1 files changed, 1 insertions, 13 deletions
diff --git a/components/policy/core/common/policy_loader_ios_unittest.mm b/components/policy/core/common/policy_loader_ios_unittest.mm
index ddb46ce..f2ffcdd 100644
--- a/components/policy/core/common/policy_loader_ios_unittest.mm
+++ b/components/policy/core/common/policy_loader_ios_unittest.mm
@@ -145,13 +145,7 @@ PolicyProviderTestHarness* TestHarness::Create() {
// static
PolicyProviderTestHarness* TestHarness::CreateWithEncodedKey() {
- if (base::ios::IsRunningOnIOS7OrLater())
- return new TestHarness(true);
- // Earlier versions of iOS don't have the APIs to support this test.
- // Unfortunately it's not possible to conditionally run this harness using
- // gtest, so we just fallback to running the non-encoded version.
- NSLog(@"Skipping test");
- return new TestHarness(false);
+ return new TestHarness(true);
}
void TestHarness::AddPolicies(NSDictionary* policy) {
@@ -231,12 +225,6 @@ TEST(PolicyProviderIOSTest, ChromePolicyOverEncodedChromePolicy) {
// This test verifies that if the "ChromePolicy" key is present then the
// "EncodedChromePolicy" key is ignored.
- if (!base::ios::IsRunningOnIOS7OrLater()) {
- // Skip this test if running on a version earlier than iOS 7.
- NSLog(@"Skipping test");
- return;
- }
-
NSDictionary* policy = @{
@"shared": @"wrong",
@"key1": @"value1",