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

content/common/sandbox_win.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 "content/common/sandbox_win.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/profiler.h"
 #include "base/files/file_util.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
+#include "base/metrics/field_trial.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
@@ skipping 536 matching lines @@
   // TODO(cpu): Add back the BaseNamedObjects policy.
   base::string16 object_path = PrependWindowsSessionPath(
       L"\\BaseNamedObjects\\windows_shell_global_counters");
   policy->AddKernelObjectToClose(L"Section", object_path.data());
 }
 
 void AddAppContainerPolicy(sandbox::TargetPolicy* policy, const wchar_t* sid) {
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     const base::CommandLine& command_line =
         *base::CommandLine::ForCurrentProcess();
-    if (command_line.HasSwitch(switches::kEnableAppContainer)) {
+    std::string appcontainer_trial_name =
+        base::FieldTrialList::FindFullName("EnableAppContainer");
+    if (command_line.HasSwitch(switches::kEnableAppContainer) ||
+        appcontainer_trial_name == "Enabled") {

[Alexei Svitkine (slow), 2015/11/02 17:27:52]

Does this code run in the child process, browser process or both?

I'm asking because I'd like to suggest you to use the new base/feature_list.h
API (which automatically can integrate with FieldTrials without using the
FieldTrial API explicitly), but currently there's a limitation with it that has
an issue with content/ code that runs in the browser process. (I have a CL
fixing this, but it hasn't landed yet).

If this doesn't run in the browser process, then I think it should be fine to
switch to the new API.

       policy->SetLowBox(sid);
     }
   }
 }
 
 bool AddWin32kLockdownPolicy(sandbox::TargetPolicy* policy) {
 #if !defined(NACL_WIN64)
   if (!IsWin32kRendererLockdownEnabled())
     return true;
 
@@ skipping 283 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content