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

Side by Side Diff: content/test/content_test_launcher.cc

Issue 11228040: Move sandbox code in content to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 return new ShellContentClient(); 78 return new ShellContentClient();
79 } 79 }
80 80
81 #if defined(OS_WIN) 81 #if defined(OS_WIN)
82 ui::ScopedOleInitializer ole_initializer_; 82 ui::ScopedOleInitializer ole_initializer_;
83 #endif 83 #endif
84 84
85 DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite); 85 DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite);
86 }; 86 };
87 87
88 class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate { 88 class ContentTestLauncherDelegate : public TestLauncherDelegate {
89 public: 89 public:
90 ContentTestLauncherDelegate() {} 90 ContentTestLauncherDelegate() {}
91 virtual ~ContentTestLauncherDelegate() {} 91 virtual ~ContentTestLauncherDelegate() {}
92 92
93 virtual std::string GetEmptyTestName() OVERRIDE { 93 virtual std::string GetEmptyTestName() OVERRIDE {
94 return std::string(); 94 return std::string();
95 } 95 }
96 96
97 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { 97 virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
98 return ContentBrowserTestSuite(argc, argv).Run(); 98 return ContentBrowserTestSuite(argc, argv).Run();
(...skipping 16 matching lines...) Expand all
115 }; 115 };
116 116
117 } // namespace content 117 } // namespace content
118 118
119 int main(int argc, char** argv) { 119 int main(int argc, char** argv) {
120 // Always use fake WebRTC devices in this binary since we want to be able 120 // Always use fake WebRTC devices in this binary since we want to be able
121 // to test WebRTC even if we don't have any devices on the system. 121 // to test WebRTC even if we don't have any devices on the system.
122 media_stream::MediaStreamManager::AlwaysUseFakeDevice(); 122 media_stream::MediaStreamManager::AlwaysUseFakeDevice();
123 123
124 content::ContentTestLauncherDelegate launcher_delegate; 124 content::ContentTestLauncherDelegate launcher_delegate;
125 return test_launcher::LaunchTests(&launcher_delegate, argc, argv); 125 return LaunchTests(&launcher_delegate, argc, argv);
126 } 126 }
OLDNEW
« content/common/sandbox_mac.h ('K') | « content/public/test/test_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698