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

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

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 years, 8 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/memory/scoped_ptr.h"
8 #include "base/path_service.h" 9 #include "base/path_service.h"
9 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
10 #include "build/build_config.h" 11 #include "build/build_config.h"
11 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
12 #include "chrome/test/ppapi/ppapi_test.h" 13 #include "chrome/test/ppapi/ppapi_test.h"
13 #include "components/nacl/common/nacl_switches.h" 14 #include "components/nacl/common/nacl_switches.h"
14 15
15 static const base::FilePath::CharType kMockNaClGdb[] = 16 static const base::FilePath::CharType kMockNaClGdb[] =
16 #if defined(OS_WIN) 17 #if defined(OS_WIN)
17 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); 18 FILE_PATH_LITERAL("mock_nacl_gdb.exe");
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 73
73 // Fails on the ASAN test bot. See http://crbug.com/122219 74 // Fails on the ASAN test bot. See http://crbug.com/122219
74 #if defined(ADDRESS_SANITIZER) 75 #if defined(ADDRESS_SANITIZER)
75 #define MAYBE_Empty DISABLED_Empty 76 #define MAYBE_Empty DISABLED_Empty
76 #else 77 #else
77 #define MAYBE_Empty Empty 78 #define MAYBE_Empty Empty
78 #endif 79 #endif
79 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { 80 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) {
80 RunWithNaClGdb("Empty"); 81 RunWithNaClGdb("Empty");
81 } 82 }
OLDNEW
« no previous file with comments | « chrome/browser/locale_tests_browsertest.cc ('k') | chrome/browser/process_singleton_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698