Disable the managed storage API behind a flag for M22.

chrome/browser/extensions/settings/settings_apitest.cc

Index: chrome/browser/extensions/settings/settings_apitest.cc
diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc
index 9806e9cafa41f6218f1b96cab16d91a94fdb24fc..cab59b7bc7d0f43cab31fdcb69e8c636088dffe5 100644
--- a/chrome/browser/extensions/settings/settings_apitest.cc
+++ b/chrome/browser/extensions/settings/settings_apitest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -12,6 +13,7 @@
 #include "chrome/browser/extensions/settings/settings_sync_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/value_builder.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "sync/api/sync_change.h"
@@ -86,6 +88,9 @@ class ExtensionSettingsApiTest : public ExtensionApiTest {
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kEnableManagedStorage);
+
 #if defined(ENABLE_CONFIGURATION_POLICY)
     EXPECT_CALL(policy_provider_, IsInitializationComplete())
         .WillRepeatedly(Return(true));