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

Side by Side Diff: components/nacl/loader/nacl_helper_win_64.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/nacl/loader/nacl_helper_win_64.h" 5 #include "components/nacl/loader/nacl_helper_win_64.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 base::EnableTerminationOnOutOfMemory(); 76 base::EnableTerminationOnOutOfMemory();
77 base::win::RegisterInvalidParamHandler(); 77 base::win::RegisterInvalidParamHandler();
78 base::win::SetupCRT(command_line); 78 base::win::SetupCRT(command_line);
79 // Route stdio to parent console (if any) or create one. 79 // Route stdio to parent console (if any) or create one.
80 if (command_line.HasSwitch(switches::kEnableLogging)) 80 if (command_line.HasSwitch(switches::kEnableLogging))
81 base::RouteStdioToConsole(true); 81 base::RouteStdioToConsole(true);
82 82
83 // Initialize the sandbox for this process. 83 // Initialize the sandbox for this process.
84 bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); 84 bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info);
85 // Die if the sandbox can't be enabled. 85 // Die if the sandbox can't be enabled.
86 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " 86 // Error initializing sandbox for |process_type|
87 << process_type; 87 CHECK(sandbox_initialized_ok);
88 content::MainFunctionParams main_params(command_line); 88 content::MainFunctionParams main_params(command_line);
89 main_params.sandbox_info = &sandbox_info; 89 main_params.sandbox_info = &sandbox_info;
90 90
91 if (process_type == switches::kNaClLoaderProcess) 91 if (process_type == switches::kNaClLoaderProcess)
92 return NaClMain(main_params); 92 return NaClMain(main_params);
93 93
94 if (process_type == switches::kNaClBrokerProcess) 94 if (process_type == switches::kNaClBrokerProcess)
95 return NaClBrokerMain(main_params); 95 return NaClBrokerMain(main_params);
96 96
97 CHECK(false) << "Unknown NaCl 64 process."; 97 // Unknown NaCl 64 process.
98 CHECK(false);
98 return -1; 99 return -1;
99 } 100 }
100 101
101 } // namespace nacl 102 } // namespace nacl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698