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

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

Issue 12805004: Remove mention of the nacl process in content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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
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 15 matching lines...) Expand all
26 #include "content/public/app/content_main_delegate.h" 26 #include "content/public/app/content_main_delegate.h"
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_win.h"
37 #include "sandbox/win/src/sandbox_factory.h" 37 #include "sandbox/win/src/sandbox_factory.h"
38 #include "sandbox/win/src/sandbox_types.h" 38 #include "sandbox/win/src/sandbox_types.h"
39 #elif defined(OS_MACOSX) 39 #elif defined(OS_MACOSX)
40 #include "base/mac/scoped_nsautorelease_pool.h" 40 #include "base/mac/scoped_nsautorelease_pool.h"
41 #endif 41 #endif
42 42
43 namespace content { 43 namespace content {
44 44
45 namespace { 45 namespace {
46 46
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 cycles--; 744 cycles--;
745 } 745 }
746 return exit_code; 746 return exit_code;
747 } 747 }
748 748
749 TestLauncherDelegate* GetCurrentTestLauncherDelegate() { 749 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
750 return g_launcher_delegate; 750 return g_launcher_delegate;
751 } 751 }
752 752
753 } // namespace content 753 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/sandboxed_process_launcher_delegate.h ('k') | content/renderer/pepper/pepper_plugin_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698