Merge M53: Ignore desktop creation errors in the sandbox.

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 <stddef.h>
 
 #include <string>
 
@@ skipping 392 matching lines @@
   result = policy->SetDelayedIntegrityLevel(sandbox::INTEGRITY_LEVEL_UNTRUSTED);
   if (result != sandbox::SBOX_ALL_OK)
     return result;
   result = policy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
   if (result != sandbox::SBOX_ALL_OK)
     return result;
   policy->SetLockdownDefaultDacl();
 
   result = policy->SetAlternateDesktop(true);
   if (result != sandbox::SBOX_ALL_OK) {
+    // Ignore the result of setting the alternate desktop.
     DLOG(WARNING) << "Failed to apply desktop security to the renderer";
-    return result;
+    result = sandbox::SBOX_ALL_OK;
   }
 
   return result;
 }
 
 // Updates the command line arguments with debug-related flags. If debug flags
 // have been used with this process, they will be filtered and added to
 // command_line as needed.
 void ProcessDebugFlags(base::CommandLine* command_line) {
   const base::CommandLine& current_cmd_line =
@@ skipping 391 matching lines @@
   }
 
   delegate->PostSpawnTarget(target.process_handle());
 
   CHECK(ResumeThread(target.thread_handle()) != static_cast<DWORD>(-1));
   *process = base::Process(target.TakeProcessHandle());
   return sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content