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

Side by Side Diff: chrome/test/ppapi/ppapi_test.h

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 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
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('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 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_ 5 #ifndef CHROME_TEST_PPAPI_PPAPI_TEST_H_
6 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_ 6 #define CHROME_TEST_PPAPI_PPAPI_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 class OutOfProcessPPAPIPrivateTest : public OutOfProcessPPAPITest { 124 class OutOfProcessPPAPIPrivateTest : public OutOfProcessPPAPITest {
125 protected: 125 protected:
126 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 126 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
127 }; 127 };
128 128
129 // NaCl plugin test runner for Newlib runtime. 129 // NaCl plugin test runner for Newlib runtime.
130 class PPAPINaClTest : public PPAPITestBase { 130 class PPAPINaClTest : public PPAPITestBase {
131 public: 131 public:
132 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 132 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
133 virtual void SetUpOnMainThread() OVERRIDE;
133 // PPAPITestBase overrides. 134 // PPAPITestBase overrides.
134 virtual void RunTest(const std::string& test_case) OVERRIDE; 135 virtual void RunTest(const std::string& test_case) OVERRIDE;
135 virtual void RunTestAndReload(const std::string& test_case) OVERRIDE; 136 virtual void RunTestAndReload(const std::string& test_case) OVERRIDE;
136 virtual void RunTestViaHTTP(const std::string& test_case) OVERRIDE; 137 virtual void RunTestViaHTTP(const std::string& test_case) OVERRIDE;
137 virtual void RunTestWithSSLServer(const std::string& test_case) OVERRIDE; 138 virtual void RunTestWithSSLServer(const std::string& test_case) OVERRIDE;
138 virtual void RunTestWithWebSocketServer( 139 virtual void RunTestWithWebSocketServer(
139 const std::string& test_case) OVERRIDE; 140 const std::string& test_case) OVERRIDE;
140 virtual void RunTestIfAudioOutputAvailable( 141 virtual void RunTestIfAudioOutputAvailable(
141 const std::string& test_case) OVERRIDE; 142 const std::string& test_case) OVERRIDE;
142 virtual void RunTestViaHTTPIfAudioOutputAvailable( 143 virtual void RunTestViaHTTPIfAudioOutputAvailable(
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 const std::string& test_case) OVERRIDE; 188 const std::string& test_case) OVERRIDE;
188 }; 189 };
189 190
190 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest { 191 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
191 public: 192 public:
192 // PPAPITestBase override: 193 // PPAPITestBase override:
193 virtual void SetUpOnMainThread() OVERRIDE; 194 virtual void SetUpOnMainThread() OVERRIDE;
194 }; 195 };
195 196
196 #endif // CHROME_TEST_PPAPI_PPAPI_TEST_H_ 197 #endif // CHROME_TEST_PPAPI_PPAPI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698