Support sideloaded fonts via command line option for blink layout_tests

content/common/sandbox_win.cc

Index: content/common/sandbox_win.cc
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index 6f063d7d8384610e714dc3721e6bb4031ddcf34c..603dcbe9e17c0ce761ec1ee1314451d37e37fe4a 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -15,8 +15,10 @@
 #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"
@@ -581,6 +583,19 @@ bool ShouldUseDirectWrite() {
          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) {
@@ -654,6 +669,16 @@ base::ProcessHandle StartSandboxedProcess(
                   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