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

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

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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
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/files/file_util.h" 7 #include "base/files/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" 12 #include "components/nacl/common/nacl_switches.h"
13 13
14 static const base::FilePath::CharType kMockNaClGdb[] = 14 static const base::FilePath::CharType kMockNaClGdb[] =
15 #if defined(OS_WIN) 15 #if defined(OS_WIN)
16 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); 16 FILE_PATH_LITERAL("mock_nacl_gdb.exe");
17 #else 17 #else
18 FILE_PATH_LITERAL("mock_nacl_gdb"); 18 FILE_PATH_LITERAL("mock_nacl_gdb");
19 #endif 19 #endif
20 20
21 class NaClGdbTest : public PPAPINaClNewlibTest { 21 class NaClGdbTest : public PPAPINaClNewlibTest {
22 public: 22 public:
23 NaClGdbTest() { 23 NaClGdbTest() {
24 } 24 }
25 25
26 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 26 virtual void SetUpCommandLine(CommandLine* command_line) override {
27 PPAPINaClNewlibTest::SetUpCommandLine(command_line); 27 PPAPINaClNewlibTest::SetUpCommandLine(command_line);
28 28
29 base::FilePath mock_nacl_gdb; 29 base::FilePath mock_nacl_gdb;
30 EXPECT_TRUE(PathService::Get(base::DIR_EXE, &mock_nacl_gdb)); 30 EXPECT_TRUE(PathService::Get(base::DIR_EXE, &mock_nacl_gdb));
31 mock_nacl_gdb = mock_nacl_gdb.Append(kMockNaClGdb); 31 mock_nacl_gdb = mock_nacl_gdb.Append(kMockNaClGdb);
32 command_line->AppendSwitchPath(switches::kNaClGdb, mock_nacl_gdb); 32 command_line->AppendSwitchPath(switches::kNaClGdb, mock_nacl_gdb);
33 EXPECT_TRUE(base::CreateTemporaryFile(&script_)); 33 EXPECT_TRUE(base::CreateTemporaryFile(&script_));
34 command_line->AppendSwitchPath(switches::kNaClGdbScript, script_); 34 command_line->AppendSwitchPath(switches::kNaClGdbScript, script_);
35 } 35 }
36 36
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 // Fails on the ASAN test bot. See http://crbug.com/122219 72 // Fails on the ASAN test bot. See http://crbug.com/122219
73 #if defined(ADDRESS_SANITIZER) 73 #if defined(ADDRESS_SANITIZER)
74 #define MAYBE_Empty DISABLED_Empty 74 #define MAYBE_Empty DISABLED_Empty
75 #else 75 #else
76 #define MAYBE_Empty Empty 76 #define MAYBE_Empty Empty
77 #endif 77 #endif
78 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { 78 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) {
79 RunWithNaClGdb("Empty"); 79 RunWithNaClGdb("Empty");
80 } 80 }
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc ('k') | chrome/browser/net/about_protocol_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698