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: sandbox/win/tests/common/controller.h

Issue 109843003: Replace wstring with string16 in sandbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « sandbox/win/src/window.cc ('k') | sandbox/win/tests/common/controller.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 #ifndef SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_ 5 #ifndef SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_
6 #define SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_ 6 #define SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/strings/string16.h"
11 #include "base/win/scoped_handle.h" 12 #include "base/win/scoped_handle.h"
12 #include "sandbox/win/src/sandbox.h" 13 #include "sandbox/win/src/sandbox.h"
13 14
14 namespace sandbox { 15 namespace sandbox {
15 16
16 // See winerror.h for details. 17 // See winerror.h for details.
17 #define SEVERITY_INFO_FLAGS 0x40000000 18 #define SEVERITY_INFO_FLAGS 0x40000000
18 #define SEVERITY_ERROR_FLAGS 0xC0000000 19 #define SEVERITY_ERROR_FLAGS 0xC0000000
19 #define CUSTOMER_CODE 0x20000000 20 #define CUSTOMER_CODE 0x20000000
20 #define SBOX_TESTS_FACILITY 0x05B10000 21 #define SBOX_TESTS_FACILITY 0x05B10000
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 bool no_sandbox_; 142 bool no_sandbox_;
142 bool kill_on_destruction_; 143 bool kill_on_destruction_;
143 base::win::ScopedHandle target_process_; 144 base::win::ScopedHandle target_process_;
144 DWORD target_process_id_; 145 DWORD target_process_id_;
145 }; 146 };
146 147
147 // Returns the broker services. 148 // Returns the broker services.
148 BrokerServices* GetBroker(); 149 BrokerServices* GetBroker();
149 150
150 // Constructs a full path to a file inside the system32 (or syswow64) folder. 151 // Constructs a full path to a file inside the system32 (or syswow64) folder.
151 std::wstring MakePathToSys(const wchar_t* name, bool is_obj_man_path); 152 base::string16 MakePathToSys(const wchar_t* name, bool is_obj_man_path);
152 153
153 // Runs the given test on the target process. 154 // Runs the given test on the target process.
154 int DispatchCall(int argc, wchar_t **argv); 155 int DispatchCall(int argc, wchar_t **argv);
155 156
156 } // namespace sandbox 157 } // namespace sandbox
157 158
158 #endif // SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_ 159 #endif // SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_
OLDNEW
« no previous file with comments | « sandbox/win/src/window.cc ('k') | sandbox/win/tests/common/controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698