Commit ed8ae789 authored by Eric Noyau's avatar Eric Noyau Committed by Commit Bot

Removing experimental flags for MDM

Bug: 
Change-Id: I0d83c2ab10efe07ec08b87b4c981cd6beea6be81
Reviewed-on: https://chromium-review.googlesource.com/600055Reviewed-by: default avatarJérôme Lebel <jlebel@chromium.org>
Commit-Queue: Eric Noyau <noyau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491722}
parent ced48bd2
...@@ -40,7 +40,6 @@ NSString* const kForceResetContextualSearch = @"ForceResetContextualSearch"; ...@@ -40,7 +40,6 @@ NSString* const kForceResetContextualSearch = @"ForceResetContextualSearch";
NSString* const kGaiaEnvironment = @"GAIAEnvironment"; NSString* const kGaiaEnvironment = @"GAIAEnvironment";
NSString* const kHeuristicsForPasswordGeneration = NSString* const kHeuristicsForPasswordGeneration =
@"HeuristicsForPasswordGeneration"; @"HeuristicsForPasswordGeneration";
NSString* const kMDMIntegrationDisabled = @"MDMIntegrationDisabled";
NSString* const kOriginServerHost = @"AlternateOriginServerHost"; NSString* const kOriginServerHost = @"AlternateOriginServerHost";
NSString* const kSafariVCSignInDisabled = @"SafariVCSignInDisabled"; NSString* const kSafariVCSignInDisabled = @"SafariVCSignInDisabled";
NSString* const kWhatsNewPromoStatus = @"WhatsNewPromoStatus"; NSString* const kWhatsNewPromoStatus = @"WhatsNewPromoStatus";
...@@ -101,13 +100,14 @@ bool IsAutoReloadEnabled() { ...@@ -101,13 +100,14 @@ bool IsAutoReloadEnabled() {
} }
bool IsLRUSnapshotCacheEnabled() { bool IsLRUSnapshotCacheEnabled() {
// TODO(crbug.com/751553): Remove this flag and its associated code. // TODO(crbug.com/751553): Remove this function and its associated code.
return NO; return NO;
} }
bool IsMDMIntegrationEnabled() { bool IsMDMIntegrationEnabled() {
return ![[NSUserDefaults standardUserDefaults] // TODO(crbug.com/752073): Remove this function and its associated code,
boolForKey:kMDMIntegrationDisabled]; // or convert it into a base::Feature.
return YES;
} }
bool IsMemoryDebuggingEnabled() { bool IsMemoryDebuggingEnabled() {
......
...@@ -84,16 +84,6 @@ ...@@ -84,16 +84,6 @@
<key>DefaultValue</key> <key>DefaultValue</key>
<false/> <false/>
</dict> </dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Disable MDM Integration</string>
<key>Key</key>
<string>MDMIntegrationDisabled</string>
<key>DefaultValue</key>
<false/>
</dict>
<dict> <dict>
<key>Type</key> <key>Type</key>
<string>PSToggleSwitchSpecifier</string> <string>PSToggleSwitchSpecifier</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment