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

Side by Side Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 2533123002: Fix GN missing headers in //base (Closed)
Patch Set: remove dependency on check_gn_headers Created 3 years, 11 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
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | chrome/test/ppapi/ppapi_browsertest.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 #include <stdio.h> 5 #include <stdio.h>
6 #if defined(OS_POSIX) 6 #if defined(OS_POSIX)
7 #include <unistd.h> 7 #include <unistd.h>
8 #elif defined(OS_WIN) 8 #elif defined(OS_WIN)
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
11 11
12 #define TELEMETRY 1 12 #define TELEMETRY 1
13 13
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/environment.h" 15 #include "base/environment.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/process/kill.h" 17 #include "base/process/kill.h"
18 #include "base/process/launch.h" 18 #include "base/process/launch.h"
19 #include "base/process/process.h" 19 #include "base/process/process.h"
20 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
21 #include "base/win/windows_version.h"
22 #include "build/build_config.h" 21 #include "build/build_config.h"
23 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
24 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
25 #include "chrome/test/nacl/nacl_browsertest_util.h" 24 #include "chrome/test/nacl/nacl_browsertest_util.h"
26 #include "components/nacl/browser/nacl_browser.h" 25 #include "components/nacl/browser/nacl_browser.h"
27 #include "components/nacl/common/nacl_switches.h" 26 #include "components/nacl/common/nacl_switches.h"
28 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
29 28
29 #if defined(OS_WIN)
30 #include "base/win/windows_version.h"
31 #endif
32
30 namespace { 33 namespace {
31 34
32 #if defined(OS_WIN) 35 #if defined(OS_WIN)
33 // crbug.com/98721 36 // crbug.com/98721
34 # define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln 37 # define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln
35 #else 38 #else
36 # define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln 39 # define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln
37 #endif 40 #endif
38 41
39 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { 42 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 } 434 }
432 435
433 // TODO(ncbray) support glibc and PNaCl 436 // TODO(ncbray) support glibc and PNaCl
434 // flaky: crbug.com/375894 437 // flaky: crbug.com/375894
435 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 438 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
436 RunNaClIntegrationTest(FILE_PATH_LITERAL( 439 RunNaClIntegrationTest(FILE_PATH_LITERAL(
437 "ppapi_extension_mime_handler.html")); 440 "ppapi_extension_mime_handler.html"));
438 } 441 }
439 442
440 } // namespace 443 } // namespace
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698