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

Side by Side Diff: chrome/test/nacl/nacl_browsertest_util.h

Issue 392023002: Remove disable-pnacl flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ 5 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ 6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 virtual bool IsAPnaclTest() OVERRIDE; 126 virtual bool IsAPnaclTest() OVERRIDE;
127 }; 127 };
128 128
129 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase { 129 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase {
130 public: 130 public:
131 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; 131 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
132 virtual base::FilePath::StringType Variant() OVERRIDE; 132 virtual base::FilePath::StringType Variant() OVERRIDE;
133 }; 133 };
134 134
135 // Class used to test that when --disable-pnacl is specified the PNaCl mime
136 // type is not available.
137 class NaClBrowserTestPnaclDisabled : public NaClBrowserTestBase {
138 public:
139 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
140
141 virtual base::FilePath::StringType Variant() OVERRIDE;
142
143 virtual bool IsAPnaclTest() OVERRIDE;
144
145 virtual bool IsPnaclDisabled() OVERRIDE;
146 };
147
148 class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase { 135 class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase {
149 public: 136 public:
150 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; 137 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
151 virtual base::FilePath::StringType Variant() OVERRIDE; 138 virtual base::FilePath::StringType Variant() OVERRIDE;
152 }; 139 };
153 140
154 // A NaCl browser test only using static files. 141 // A NaCl browser test only using static files.
155 class NaClBrowserTestStatic : public NaClBrowserTestBase { 142 class NaClBrowserTestStatic : public NaClBrowserTestBase {
156 public: 143 public:
157 virtual base::FilePath::StringType Variant() OVERRIDE; 144 virtual base::FilePath::StringType Variant() OVERRIDE;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 187
201 #define NACL_BROWSER_TEST_F(suite, name, body) \ 188 #define NACL_BROWSER_TEST_F(suite, name, body) \
202 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ 189 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
203 body \ 190 body \
204 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ 191 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \
205 body \ 192 body \
206 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ 193 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
207 body 194 body
208 195
209 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ 196 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698