Added field trial for enabling AppContainer and a chrome://flags entry.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 2104 matching lines @@
      MULTI_VALUE_TYPE(kPpapiWin32kLockdown)},
 #endif  // defined(OS_WIN)
 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID)
     {"enable-web-notification-custom-layouts",
      IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME,
      IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION,
      kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts,
                                switches::kDisableWebNotificationCustomLayouts)},
 #endif  // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID)
+#if defined(OS_WIN)
+    {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME,
+     IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin,
+     SINGLE_VALUE_TYPE(switches::kEnableAppContainer)},

[Alexei Svitkine (slow), 2015/11/02 18:58:55]

Suggest making this ENABLE_DISABLE_VALUE_TYPE() with both an enable and disable
switch.

Now that this will be controlled by a field trial, a user's default state may
actually be enabled and if you're providing control in about:flags, there should
be a way to turn it off as well.

+#endif  // defined(OS_WIN)
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 // Stores and encapsulates the little state that about:flags has.
 class FlagsState {
  public:
   FlagsState()
       : feature_entries(kFeatureEntries),
@@ skipping 829 matching lines @@
   FlagsState::GetInstance()->SetFeatureEntries(entries, count);
 }
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   return FlagsState::GetInstance()->GetFeatureEntries(count);
 }
 
 }  // namespace testing
 
 }  // namespace about_flags