Support sideloaded fonts via command line option for blink layout_tests

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/debugger.h"
 #include "base/debug/profiler.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/hash.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "ipc/ipc_switches.h"
 #include "sandbox/win/src/process_mitigations.h"
@@ skipping 544 matching lines @@
 bool ShouldUseDirectWrite() {
   // If the flag is currently on, and we're on Win7 or above, we enable
   // DirectWrite. Skia does not require the additions to DirectWrite in QFE
   // 2670838, so a Win7 check is sufficient. We do not currently attempt to
   // support Vista, where SP2 and the Platform Update are required.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   return command_line.HasSwitch(switches::kEnableDirectWrite) &&
          base::win::GetVersion() >= base::win::VERSION_WIN7;
 }
 
+bool GetSideloadFontFiles(std::vector<std::string>* files) {
+  files->clear();

[jam, 2014/04/14 05:40:02]

nit: no need for return value and out parameter, just return the std::vector.
then you don't even need the "clear" call

[scottmg, 2014/04/14 15:48:58]

Done.

+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kRegisterFontFiles)) {
+    std::vector<std::string> font_files;
+    base::SplitString(
+        command_line.GetSwitchValueASCII(switches::kRegisterFontFiles),
+        ';',
+        files);
+  }
+  return !files->empty();
+}
+
 base::ProcessHandle StartSandboxedProcess(
     SandboxedProcessLauncherDelegate* delegate,
     CommandLine* cmd_line) {
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType);
 
   TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str);
 
   bool in_sandbox = true;
   if (delegate)
@@ skipping 53 matching lines @@
   if (!disable_default_policy && !AddPolicyForSandboxedProcess(policy))
     return 0;
 
   if (type_str == switches::kRendererProcess) {
     if (ShouldUseDirectWrite()) {
       AddDirectory(base::DIR_WINDOWS_FONTS,
                   NULL,
                   true,
                   sandbox::TargetPolicy::FILES_ALLOW_READONLY,
                   policy);
+      std::vector<std::string> font_files;
+      if (GetSideloadFontFiles(&font_files)) {
+        for (std::vector<std::string>::const_iterator i(font_files.begin());
+             i != font_files.end();
+             ++i) {
+          policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES,
+                          sandbox::TargetPolicy::FILES_ALLOW_READONLY,
+                          base::UTF8ToWide(i->c_str()).c_str());

[jam, 2014/04/14 05:40:02]

nit: the first c_str() isn't needed

[scottmg, 2014/04/14 15:48:58]

Done.

+        }
+      }
     }
   } else {
     // Hack for Google Desktop crash. Trick GD into not injecting its DLL into
     // this subprocess. See
     // http://code.google.com/p/chromium/issues/detail?id=25580
     cmd_line->AppendSwitchASCII("ignored", " --type=renderer ");
   }
 
   sandbox::ResultCode result;
   if (!exposed_dir.empty()) {
@@ skipping 95 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content