Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing...

content/test/content_test_launcher.cc

 // Copyright (c) 2011 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/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_suite.h"
 #include "content/app/content_main.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell_main_delegate.h"
 
 #if defined(OS_WIN)
-#include "content/app/startup_helper_win.h"
+#include "content/public/app/startup_helper_win.h"
 #include "sandbox/src/sandbox_types.h"
 #endif  // defined(OS_WIN)
 
 class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
  public:
   ContentTestLauncherDelegate() {
   }
 
   virtual ~ContentTestLauncherDelegate() {
   }
@@ skipping 31 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
 int main(int argc, char** argv) {
   ContentTestLauncherDelegate launcher_delegate;
   return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
 }