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

Side by Side Diff: chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc

Issue 16867015: Revert r207951 - "Separate NaCl switches to their own file." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/browser/nacl_host/nacl_process_host.cc ('k') | chrome/common/DEPS » ('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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/environment.h" 6 #include "base/environment.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/test/ppapi/ppapi_test.h" 11 #include "chrome/test/ppapi/ppapi_test.h"
12 #include "components/nacl/common/nacl_switches.h"
13 12
14 static const base::FilePath::CharType kMockNaClGdb[] = 13 static const base::FilePath::CharType kMockNaClGdb[] =
15 #if defined(OS_WIN) 14 #if defined(OS_WIN)
16 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); 15 FILE_PATH_LITERAL("mock_nacl_gdb.exe");
17 #else 16 #else
18 FILE_PATH_LITERAL("mock_nacl_gdb"); 17 FILE_PATH_LITERAL("mock_nacl_gdb");
19 #endif 18 #endif
20 19
21 class NaClGdbTest : public PPAPINaClNewlibTest { 20 class NaClGdbTest : public PPAPINaClNewlibTest {
22 public: 21 public:
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 70
72 // Fails on the ASAN test bot. See http://crbug.com/122219 71 // Fails on the ASAN test bot. See http://crbug.com/122219
73 #if defined(ADDRESS_SANITIZER) 72 #if defined(ADDRESS_SANITIZER)
74 #define MAYBE_Empty DISABLED_Empty 73 #define MAYBE_Empty DISABLED_Empty
75 #else 74 #else
76 #define MAYBE_Empty Empty 75 #define MAYBE_Empty Empty
77 #endif 76 #endif
78 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { 77 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) {
79 RunWithNaClGdb("Empty"); 78 RunWithNaClGdb("Empty");
80 } 79 }
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | chrome/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698