Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: content/public/test/test_launcher.cc

Issue 10907217: Revert 156550 - Add sandbox support for Windows process mitigations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | sandbox/win/sandbox_win.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/test/test_launcher.h" 5 #include "content/public/test/test_launcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 16 matching lines...) Expand all
27 #include "content/public/app/startup_helper_win.h" 27 #include "content/public/app/startup_helper_win.h"
28 #include "content/public/common/content_switches.h" 28 #include "content/public/common/content_switches.h"
29 #include "content/public/common/sandbox_init.h" 29 #include "content/public/common/sandbox_init.h"
30 #include "content/public/test/browser_test.h" 30 #include "content/public/test/browser_test.h"
31 #include "net/base/escape.h" 31 #include "net/base/escape.h"
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 #include "base/base_switches.h" 35 #include "base/base_switches.h"
36 #include "content/common/sandbox_policy.h" 36 #include "content/common/sandbox_policy.h"
37 #include "sandbox/win/src/dep.h"
37 #include "sandbox/win/src/sandbox_factory.h" 38 #include "sandbox/win/src/sandbox_factory.h"
38 #include "sandbox/win/src/sandbox_types.h" 39 #include "sandbox/win/src/sandbox_types.h"
39 #elif defined(OS_MACOSX) 40 #elif defined(OS_MACOSX)
40 #include "base/mac/scoped_nsautorelease_pool.h" 41 #include "base/mac/scoped_nsautorelease_pool.h"
41 #endif 42 #endif
42 43
43 namespace test_launcher { 44 namespace test_launcher {
44 45
45 namespace { 46 namespace {
46 47
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 cycles--; 776 cycles--;
776 } 777 }
777 return exit_code; 778 return exit_code;
778 } 779 }
779 780
780 TestLauncherDelegate* GetCurrentTestLauncherDelegate() { 781 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
781 return g_launcher_delegate; 782 return g_launcher_delegate;
782 } 783 }
783 784
784 } // namespace test_launcher 785 } // namespace test_launcher
OLDNEW
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | sandbox/win/sandbox_win.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698